From patchwork Wed Dec 18 12:01:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11300447 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6FD2A109A for ; Wed, 18 Dec 2019 12:12:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 456932072B for ; Wed, 18 Dec 2019 12:12:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="q+21bkDe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 456932072B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:53272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihYBn-0002Us-Sf for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Dec 2019 07:12:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47222) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihY2z-0006F6-VJ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:03:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihY2x-0000N8-Pr for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:03:21 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:36348) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihY2x-0000L2-97 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:03:19 -0500 Received: by mail-wm1-x330.google.com with SMTP id p17so1618462wma.1 for ; Wed, 18 Dec 2019 04:03:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3WRnncE6Xv1vFi9oT2WvIobLxUM3RsPPFBEVRSOhGZo=; b=q+21bkDe8EJfA6/igHJN7CBs+7C3RTaJ0sUHdUQTdAWHiLYj2WJ6KRKPLCmofRkYc4 OlRunhh2rsfryzbiM63RYtgN/yfT+rksRhBOfpf7d1lS1vW9MxsmoJgapEvq4Z3utevU 3wO69bv5zMNxN4NYskYbyl7xcPGgt6wlsXvBGzf76r6rurZTXrtLN9tdyM1j8TIqVQJX SmD3pijYsdEaiaVbgH2L6hJgJiZBbc7wXmVUMvDRngN/u0gj5gYrZ05y8QQxxiMgycyj h4eG4sAMv6I+rX1rihODWK6UydhAPbTtzL65/d9k5EyQ0kvgL3yDgsA/WGEjtMpyBjvf vVTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3WRnncE6Xv1vFi9oT2WvIobLxUM3RsPPFBEVRSOhGZo=; b=O24xtFT0OCE3CMKBIbP/s0hZfQHORxV+iPJJLhL/X/CBZnVX/emZv8cerL2RAmubHK 6wQ09BVwPHjLni733cVFMqHuibJ+aGIPQSv2mVr7DqzByTskJtP+uWRHnpBVK+UKl93q h8FcvLz9H0bJdhsuDBqKdLStVR+N5P5ndvwCmzM8oFVCRxM/epHWaDYZkrY/+Cjk/2jm PyBfwAUNIflFf4fmkoKMdqvojymF/KLo2uUAsPIwsQP+KmuPuCZ3rXy2rxladaAR5VdK bnBM0mLAEUlKl5X8x/af3lGzegh6mGNOZa2FNAZ202htlNhCGqxrOjq4GrOTN5Tjxs4c OrDQ== X-Gm-Message-State: APjAAAX14f1/UD17SSbXuC1sZWZPjup1hFnAnpYUoxhANKgsqxN+8EDb qMvLAodYBBWXgSAZYUAXV4kYI4eF X-Google-Smtp-Source: APXvYqy3FS1RxeLcAhiZNgia8I5FX+tB821vn1Fp0BDEaMtmesmHoDujwuAaC+3CQmESZMPVdbvAOQ== X-Received: by 2002:a7b:c851:: with SMTP id c17mr2941339wml.71.1576670597336; Wed, 18 Dec 2019 04:03:17 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n67sm2236838wmf.46.2019.12.18.04.03.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 04:03:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/87] qom: add object_new_with_class Date: Wed, 18 Dec 2019 13:01:48 +0100 Message-Id: <1576670573-48048-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576670573-48048-1-git-send-email-pbonzini@redhat.com> References: <1576670573-48048-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Similar to CPU and machine classes, "-accel" class names are mangled, so we have to first get a class via accel_find and then instantiate it. Provide a new function to instantiate a class without going through object_class_get_name, and use it for CPUs and machines already. Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- accel/accel.c | 4 +--- include/qom/object.h | 12 ++++++++++++ qom/object.c | 5 +++++ target/i386/cpu.c | 8 ++++---- target/s390x/cpu_models.c | 4 ++-- vl.c | 3 +-- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/accel/accel.c b/accel/accel.c index 60c3827..dd38a46 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -48,9 +48,7 @@ AccelClass *accel_find(const char *opt_name) int accel_init_machine(AccelClass *acc, MachineState *ms) { - ObjectClass *oc = OBJECT_CLASS(acc); - const char *cname = object_class_get_name(oc); - AccelState *accel = ACCEL(object_new(cname)); + AccelState *accel = ACCEL(object_new_with_class(OBJECT_CLASS(acc))); int ret; ms->accelerator = accel; *(acc->allowed) = true; diff --git a/include/qom/object.h b/include/qom/object.h index 230b18f..f9ad692 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -593,6 +593,18 @@ struct InterfaceClass __FILE__, __LINE__, __func__)) /** + * object_new_with_class: + * @klass: The class to instantiate. + * + * This function will initialize a new object using heap allocated memory. + * The returned object has a reference count of 1, and will be freed when + * the last reference is dropped. + * + * Returns: The newly allocated and instantiated object. + */ +Object *object_new_with_class(ObjectClass *klass); + +/** * object_new: * @typename: The name of the type of the object to instantiate. * diff --git a/qom/object.c b/qom/object.c index e7b72f7..0d971ca 100644 --- a/qom/object.c +++ b/qom/object.c @@ -658,6 +658,11 @@ static Object *object_new_with_type(Type type) return obj; } +Object *object_new_with_class(ObjectClass *klass) +{ + return object_new_with_type(klass->type); +} + Object *object_new(const char *typename) { TypeImpl *ti = type_get_by_name(typename); diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0a9ac65..e1eb9f4 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4695,7 +4695,7 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc, return; } - xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc)))); + xc = X86_CPU(object_new_with_class(OBJECT_CLASS(xcc))); x86_cpu_expand_features(xc, &err); if (err) { @@ -4763,7 +4763,7 @@ static GSList *get_sorted_cpu_model_list(void) static char *x86_cpu_class_get_model_id(X86CPUClass *xc) { - Object *obj = object_new(object_class_get_name(OBJECT_CLASS(xc))); + Object *obj = object_new_with_class(OBJECT_CLASS(xc)); char *r = object_property_get_str(obj, "model-id", &error_abort); object_unref(obj); return r; @@ -5141,7 +5141,7 @@ static X86CPU *x86_cpu_from_model(const char *model, QDict *props, Error **errp) goto out; } - xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc)))); + xc = X86_CPU(object_new_with_class(OBJECT_CLASS(xcc))); if (props) { object_apply_props(OBJECT(xc), props, &err); if (err) { @@ -5983,7 +5983,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) APICCommonState *apic; ObjectClass *apic_class = OBJECT_CLASS(apic_get_class()); - cpu->apic_state = DEVICE(object_new(object_class_get_name(apic_class))); + cpu->apic_state = DEVICE(object_new_with_class(apic_class)); object_property_add_child(OBJECT(cpu), "lapic", OBJECT(cpu->apic_state), &error_abort); diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 547bab8..7c32180 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -440,7 +440,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque) if (cpu_list_data->model) { Object *obj; S390CPU *sc; - obj = object_new(object_class_get_name(klass)); + obj = object_new_with_class(klass); sc = S390_CPU(obj); if (sc->model) { info->has_unavailable_features = true; @@ -498,7 +498,7 @@ static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info, error_setg(errp, "The CPU definition '%s' requires KVM", info->name); return; } - obj = object_new(object_class_get_name(oc)); + obj = object_new_with_class(oc); cpu = S390_CPU(obj); if (!cpu->model) { diff --git a/vl.c b/vl.c index b95c161..65e6b75 100644 --- a/vl.c +++ b/vl.c @@ -3834,8 +3834,7 @@ int main(int argc, char **argv, char **envp) cleanup_add_fd, NULL, &error_fatal); #endif - current_machine = MACHINE(object_new(object_class_get_name( - OBJECT_CLASS(machine_class)))); + current_machine = MACHINE(object_new_with_class(OBJECT_CLASS(machine_class))); if (machine_help_func(qemu_get_machine_opts(), current_machine)) { exit(0); }