Commit 708414f0 authored by Markus Armbruster's avatar Markus Armbruster Committed by Alexander Graf
Browse files

Revert "hw/ppc/spapr_pci.c: Avoid functions not in glib 2.12 (g_hash_table_iter_*)" 



Since we now require GLib 2.22+ (commit f40685c6), we don't have to
work around lack of g_hash_table_iter_init() & friends anymore.

This reverts commit f8833a37.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 5709af3b

hw/ppc/spapr_pci.c

+11 −17
Original line number Diff line number Diff line
@@ -1362,34 +1362,28 @@ static const VMStateDescription vmstate_spapr_pci_msi = { 
    },

};



static void spapr_pci_fill_msi_devs(gpointer key, gpointer value,

                                    gpointer opaque)

{

    sPAPRPHBState *sphb = opaque;



    sphb->msi_devs[sphb->msi_devs_num].key = *(uint32_t *)key;

    sphb->msi_devs[sphb->msi_devs_num].value = *(spapr_pci_msi *)value;

    sphb->msi_devs_num++;

}



static void spapr_pci_pre_save(void *opaque)

{

    sPAPRPHBState *sphb = opaque;

    int msi_devs_num;

    GHashTableIter iter;

    gpointer key, value;

    int i;



    if (sphb->msi_devs) {

        g_free(sphb->msi_devs);

        sphb->msi_devs = NULL;

    }

    sphb->msi_devs_num = 0;

    msi_devs_num = g_hash_table_size(sphb->msi);

    if (!msi_devs_num) {

    sphb->msi_devs_num = g_hash_table_size(sphb->msi);

    if (!sphb->msi_devs_num) {

        return;

    }

    sphb->msi_devs = g_malloc(msi_devs_num * sizeof(spapr_pci_msi_mig));

    sphb->msi_devs = g_malloc(sphb->msi_devs_num * sizeof(spapr_pci_msi_mig));



    g_hash_table_foreach(sphb->msi, spapr_pci_fill_msi_devs, sphb);

    assert(sphb->msi_devs_num == msi_devs_num);

    g_hash_table_iter_init(&iter, sphb->msi);

    for (i = 0; g_hash_table_iter_next(&iter, &key, &value); ++i) {

        sphb->msi_devs[i].key = *(uint32_t *) key;

        sphb->msi_devs[i].value = *(spapr_pci_msi *) value;

    }

}



static int spapr_pci_post_load(void *opaque, int version_id)