Commit 945741da authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-06-13' into staging 



Miscellaneous patches for 2018-06-13

# gpg: Signature made Wed 13 Jun 2018 13:51:51 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2018-06-13:
  Purge uses of banned g_assert_FOO()
  coverity-model: replay data is considered trusted
  Revert "Makefile: add target to print generated files"

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3b2a4d39 719a3077

Makefile

+0 −3
Original line number Diff line number Diff line
@@ -1055,9 +1055,6 @@ endif 
include $(SRC_PATH)/tests/docker/Makefile.include

include $(SRC_PATH)/tests/vm/Makefile.include



printgen:

	@echo $(GENERATED_FILES)



.PHONY: help

help:

	@echo  'Generic targets:'

hw/ide/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static uint64_t ahci_mem_read(void *opaque, hwaddr addr, unsigned size) 
    if (ofst + size <= 4) {

        val = lo >> (ofst * 8);

    } else {

        g_assert_cmpint(size, >, 1);

        g_assert(size > 1);



        /* If the 64bit read is unaligned, we will produce undefined

         * results. AHCI does not support unaligned 64bit reads. */

hw/ppc/spapr_ovec.c

+6 −6
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void spapr_ovec_cleanup(sPAPROptionVector *ov) 
void spapr_ovec_set(sPAPROptionVector *ov, long bitnr)

{

    g_assert(ov);

    g_assert_cmpint(bitnr, <, OV_MAXBITS);

    g_assert(bitnr < OV_MAXBITS);



    set_bit(bitnr, ov->bitmap);

}
@@ -121,7 +121,7 @@ void spapr_ovec_set(sPAPROptionVector *ov, long bitnr) 
void spapr_ovec_clear(sPAPROptionVector *ov, long bitnr)

{

    g_assert(ov);

    g_assert_cmpint(bitnr, <, OV_MAXBITS);

    g_assert(bitnr < OV_MAXBITS);



    clear_bit(bitnr, ov->bitmap);

}
@@ -129,7 +129,7 @@ void spapr_ovec_clear(sPAPROptionVector *ov, long bitnr) 
bool spapr_ovec_test(sPAPROptionVector *ov, long bitnr)

{

    g_assert(ov);

    g_assert_cmpint(bitnr, <, OV_MAXBITS);

    g_assert(bitnr < OV_MAXBITS);



    return test_bit(bitnr, ov->bitmap) ? true : false;

}
@@ -186,7 +186,7 @@ sPAPROptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector) 
    int i;



    g_assert(table_addr);

    g_assert_cmpint(vector, >=, 1); /* vector numbering starts at 1 */

    g_assert(vector >= 1);      /* vector numbering starts at 1 */



    addr = vector_addr(table_addr, vector);

    if (!addr) {
@@ -195,7 +195,7 @@ sPAPROptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector) 
    }



    vector_len = ldub_phys(&address_space_memory, addr++) + 1;

    g_assert_cmpint(vector_len, <=, OV_MAXBYTES);

    g_assert(vector_len <= OV_MAXBYTES);

    ov = spapr_ovec_new();



    for (i = 0; i < vector_len; i++) {
@@ -225,7 +225,7 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset, 
     * encoding/sizing expected in ibm,client-architecture-support

     */

    vec_len = (lastbit == OV_MAXBITS) ? 1 : lastbit / BITS_PER_BYTE + 1;

    g_assert_cmpint(vec_len, <=, OV_MAXBYTES);

    g_assert(vec_len <= OV_MAXBYTES);

    /* guest expects vector len encoded as vec_len - 1, since the length byte

     * is assumed and not included, and the first byte of the vector

     * is assumed as well

hw/usb/dev-smartcard-reader.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ static void ccid_write_data_block(USBCCIDState *s, uint8_t slot, uint8_t seq, 
        DPRINTF(s, D_VERBOSE, "error %d\n", p->b.bError);

    }

    if (len) {

        g_assert_nonnull(data);

        assert(data);

        memcpy(p->abData, data, len);

    }

    ccid_reset_error_status(s);

qom/object.c

+5 −5
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static void type_initialize(TypeImpl *ti) 
        GSList *e;

        int i;



        g_assert_cmpint(parent->class_size, <=, ti->class_size);

        g_assert(parent->class_size <= ti->class_size);

        memcpy(ti->class, parent->class, parent->class_size);

        ti->class->interfaces = NULL;

        ti->class->properties = g_hash_table_new_full(
@@ -372,9 +372,9 @@ static void object_initialize_with_type(void *data, size_t size, TypeImpl *type) 
    g_assert(type != NULL);

    type_initialize(type);



    g_assert_cmpint(type->instance_size, >=, sizeof(Object));

    g_assert(type->instance_size >= sizeof(Object));

    g_assert(type->abstract == false);

    g_assert_cmpint(size, >=, type->instance_size);

    g_assert(size >= type->instance_size);



    memset(obj, 0, type->instance_size);

    obj->class = type->class;
@@ -475,7 +475,7 @@ static void object_finalize(void *data) 
    object_property_del_all(obj);

    object_deinit(obj, ti);



    g_assert_cmpint(obj->ref, ==, 0);

    g_assert(obj->ref == 0);

    if (obj->free) {

        obj->free(obj);

    }
@@ -917,7 +917,7 @@ void object_unref(Object *obj) 
    if (!obj) {

        return;

    }

    g_assert_cmpint(obj->ref, >, 0);

    g_assert(obj->ref > 0);



    /* parent always holds a reference to its children */

    if (atomic_fetch_dec(&obj->ref) == 1) {