Now that we can safely call QOBJECT() on QObject * as well as its subtypes, we can have macros qobject_ref() / qobject_unref() that work everywhere instead of having to use QINCREF() / QDECREF() for QObject and qobject_incref() / qobject_decref() for its subtypes. The replacement is mechanical, except I broke a long line, and added a cast in monitor_qmp_cleanup_req_queue_locked(). Unlike qobject_decref(), qobject_unref() doesn't accept void *. Note that the new macros evaluate their argument exactly once, thus no need to shout them. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180419150145.24795-4-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [Rebased, semantic conflict resolved, commit message improved] Signed-off-by: Markus Armbruster <armbru@redhat.com>
		
			
				
	
	
		
			104 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			104 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Machine 'none' tests.
 | 
						|
 *
 | 
						|
 * Copyright (c) 2018 Red Hat Inc.
 | 
						|
 *
 | 
						|
 * Authors:
 | 
						|
 *  Igor Mammedov <imammedo@redhat.com>,
 | 
						|
 *
 | 
						|
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | 
						|
 * See the COPYING file in the top-level directory.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
 | 
						|
#include "qemu-common.h"
 | 
						|
#include "qemu/cutils.h"
 | 
						|
#include "libqtest.h"
 | 
						|
#include "qapi/qmp/qdict.h"
 | 
						|
 | 
						|
 | 
						|
struct arch2cpu {
 | 
						|
    const char *arch;
 | 
						|
    const char *cpu_model;
 | 
						|
};
 | 
						|
 | 
						|
static struct arch2cpu cpus_map[] = {
 | 
						|
    /* tested targets list */
 | 
						|
    { "arm", "cortex-a15" },
 | 
						|
    { "aarch64", "cortex-a57" },
 | 
						|
    { "x86_64", "qemu64,apic-id=0" },
 | 
						|
    { "i386", "qemu32,apic-id=0" },
 | 
						|
    { "alpha", "ev67" },
 | 
						|
    { "cris", "crisv32" },
 | 
						|
    { "lm32", "lm32-full" },
 | 
						|
    { "m68k", "m5206" },
 | 
						|
    /* FIXME: { "microblaze", "any" }, doesn't work with -M none -cpu any */
 | 
						|
    /* FIXME: { "microblazeel", "any" }, doesn't work with -M none -cpu any */
 | 
						|
    { "mips", "4Kc" },
 | 
						|
    { "mipsel", "4Kc" },
 | 
						|
    { "mips64", "20Kc" },
 | 
						|
    { "mips64el", "20Kc" },
 | 
						|
    { "moxie", "MoxieLite" },
 | 
						|
    { "nios2", "FIXME" },
 | 
						|
    { "or1k", "or1200" },
 | 
						|
    { "ppc", "604" },
 | 
						|
    { "ppc64", "power8e_v2.1" },
 | 
						|
    { "ppcemb", "440epb" },
 | 
						|
    { "s390x", "qemu" },
 | 
						|
    { "sh4", "sh7750r" },
 | 
						|
    { "sh4eb", "sh7751r" },
 | 
						|
    { "sparc", "LEON2" },
 | 
						|
    { "sparc64", "Fujitsu Sparc64" },
 | 
						|
    { "tricore", "tc1796" },
 | 
						|
    { "unicore32", "UniCore-II" },
 | 
						|
    { "xtensa", "dc233c" },
 | 
						|
    { "xtensaeb", "fsf" },
 | 
						|
    { "hppa", "hppa" },
 | 
						|
    { "riscv64", "rv64gcsu-v1.10.0" },
 | 
						|
    { "riscv32", "rv32gcsu-v1.9.1" },
 | 
						|
};
 | 
						|
 | 
						|
static const char *get_cpu_model_by_arch(const char *arch)
 | 
						|
{
 | 
						|
    int i;
 | 
						|
 | 
						|
    for (i = 0; i < ARRAY_SIZE(cpus_map); i++) {
 | 
						|
        if (!strcmp(arch, cpus_map[i].arch)) {
 | 
						|
            return cpus_map[i].cpu_model;
 | 
						|
        }
 | 
						|
    }
 | 
						|
    return NULL;
 | 
						|
}
 | 
						|
 | 
						|
static void test_machine_cpu_cli(void)
 | 
						|
{
 | 
						|
    QDict *response;
 | 
						|
    const char *arch = qtest_get_arch();
 | 
						|
    const char *cpu_model = get_cpu_model_by_arch(arch);
 | 
						|
 | 
						|
    if (!cpu_model) {
 | 
						|
        if (!(!strcmp(arch, "microblaze") || !strcmp(arch, "microblazeel"))) {
 | 
						|
            fprintf(stderr, "WARNING: cpu name for target '%s' isn't defined,"
 | 
						|
                    " add it to cpus_map\n", arch);
 | 
						|
        }
 | 
						|
        return; /* TODO: die here to force all targets have a test */
 | 
						|
    }
 | 
						|
    global_qtest = qtest_startf("-machine none -cpu '%s'", cpu_model);
 | 
						|
 | 
						|
    response = qmp("{ 'execute': 'quit' }");
 | 
						|
    g_assert(qdict_haskey(response, "return"));
 | 
						|
    qobject_unref(response);
 | 
						|
 | 
						|
    qtest_quit(global_qtest);
 | 
						|
}
 | 
						|
 | 
						|
int main(int argc, char **argv)
 | 
						|
{
 | 
						|
    g_test_init(&argc, &argv, NULL);
 | 
						|
 | 
						|
    qtest_add_func("machine/none/cpu_option", test_machine_cpu_cli);
 | 
						|
 | 
						|
    return g_test_run();
 | 
						|
}
 |