From nobody Tue Feb 10 14:33:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606902921; cv=none; d=zohomail.com; s=zohoarc; b=XPv13AqYAk/vypBcsmMpi+I/AJwZ8idvjlvwKGBleHQq0EA+OfXPWgVAse/nJkTk7UE9wLbLIZH/e2M2OISBw3VqdOA/v6HMd4fBMajc6BTvyV2yyxIUaOhFMsOasHG6ib/dwR7CtnYc2+DSDqsnJl/UbsnBrNOC8uOapeUQ6N4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606902921; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hL6c64p50mmdCMCGR+EYvq9bxnIVgL3+wpp3pDDcuwY=; b=RHKXuHXTp5VRjYwODdAt6eQTtoOjholKokBVMC9hSbWZMQo80y8tCl55GGOW2g904P+3PtCnfT14aXfgR8DctK7r9MIdeiNBomRLaOC+12tJYkkPcnisHXYs4zHylFqkWUqM4n951DRXieV8ZopGmoGNfLRnklXC3FFjkyb+4Ac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606902921937306.7372798266359; Wed, 2 Dec 2020 01:55:21 -0800 (PST) Received: from localhost ([::1]:55638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkOr2-0005JJ-T8 for importer@patchew.org; Wed, 02 Dec 2020 04:55:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNMJ-0006en-2f for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:19:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNM2-0006we-4b for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:19:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-198-qw-k0QpIM32QLY2za12vdQ-1; Wed, 02 Dec 2020 03:19:06 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D17E9A22F for ; Wed, 2 Dec 2020 08:19:05 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A1245D9C6; Wed, 2 Dec 2020 08:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606897147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hL6c64p50mmdCMCGR+EYvq9bxnIVgL3+wpp3pDDcuwY=; b=ZYxHSPsRsCTHaM+/yMBx7EAzzqg9dm0yaCT4HkEmf4pocgs0ECsK7jJDjg38msTA/l2pXO xudBpfrb4A35BM8d2/8atewT5AZKr54l3XhRezlye1Uf9H0KOTkOQI4f6CJPG7t8fO/YT1 ZKGplXylPtxBtAiOV3+kg6rNaNwWHYc= X-MC-Unique: qw-k0QpIM32QLY2za12vdQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/15] qtest: add a QOM object for qtest Date: Wed, 2 Dec 2020 03:18:50 -0500 Message-Id: <20201202081854.4126071-12-pbonzini@redhat.com> In-Reply-To: <20201202081854.4126071-1-pbonzini@redhat.com> References: <20201202081854.4126071-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: imammedo@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The qtest server right now can only be created using the -qtest and -qtest-log options. Allow an alternative way to create it using "-object qtest,chardev=3D...,log=3D...". Signed-off-by: Paolo Bonzini --- softmmu/qtest.c | 144 ++++++++++++++++++++++++++++++++++++++++++++---- softmmu/vl.c | 5 +- 2 files changed, 135 insertions(+), 14 deletions(-) diff --git a/softmmu/qtest.c b/softmmu/qtest.c index 7965dc9a16..d255c9681a 100644 --- a/softmmu/qtest.c +++ b/softmmu/qtest.c @@ -27,6 +27,8 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/cutils.h" +#include "qapi/qmp/qerror.h" +#include "qom/object_interfaces.h" #include CONFIG_DEVICES #ifdef CONFIG_PSERIES #include "hw/ppc/spapr_rtas.h" @@ -849,18 +851,9 @@ static void qtest_event(void *opaque, QEMUChrEvent eve= nt) break; } } -void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Er= ror **errp) -{ - Chardev *chr; - - chr =3D qemu_chr_new("qtest", qtest_chrdev, NULL); - - if (chr =3D=3D NULL) { - error_setg(errp, "Failed to initialize device for qtest: \"%s\"", - qtest_chrdev); - return; - } =20 +static bool qtest_server_start(Chardev *chr, const char *qtest_log, Error = **errp) +{ if (qtest_log) { if (strcmp(qtest_log, "none") !=3D 0) { qtest_log_fp =3D fopen(qtest_log, "w+"); @@ -869,7 +862,9 @@ void qtest_server_init(const char *qtest_chrdev, const = char *qtest_log, Error ** qtest_log_fp =3D stderr; } =20 - qemu_chr_fe_init(&qtest_chr, chr, errp); + if (!qemu_chr_fe_init(&qtest_chr, chr, errp)) { + return false; + } qemu_chr_fe_set_handlers(&qtest_chr, qtest_can_read, qtest_read, qtest_event, NULL, &qtest_chr, NULL, true); qemu_chr_fe_set_echo(&qtest_chr, true); @@ -879,8 +874,25 @@ void qtest_server_init(const char *qtest_chrdev, const= char *qtest_log, Error ** if (!qtest_server_send) { qtest_server_set_send_handler(qtest_server_char_be_send, &qtest_ch= r); } + return true; +} + +void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Er= ror **errp) +{ + Chardev *chr; + + chr =3D qemu_chr_new("qtest", qtest_chrdev, NULL); + + if (chr =3D=3D NULL) { + error_setg(errp, "Failed to initialize device for qtest: \"%s\"", + qtest_chrdev); + return; + } + + qtest_server_start(chr, qtest_log, errp); } =20 + void qtest_server_set_send_handler(void (*send)(void*, const char*), void *opaque) { @@ -905,3 +917,111 @@ void qtest_server_inproc_recv(void *dummy, const char= *buf) g_string_truncate(gstr, 0); } } + +#define TYPE_QTEST "qtest" + +OBJECT_DECLARE_SIMPLE_TYPE(QTest, QTEST) + +struct QTest { + Object parent; + + bool complete; + char *chr_name; + Chardev *chr; + char *log; +}; + +static void qtest_complete(UserCreatable *uc, Error **errp) +{ + QTest *q =3D QTEST(uc); + if (qtest_driver()) { + error_setg(errp, "Only one instance of qtest can be created"); + return; + } + if (!q->chr_name) { + error_setg(errp, "No backend specified"); + return; + } + + if (!qtest_server_start(q->chr, q->log, errp)) { + return; + } + q->complete =3D true; +} + +static void qtest_set_log(Object *obj, const char *value, Error **errp) +{ + QTest *q =3D QTEST(obj); + + if (q->complete) { + error_setg(errp, QERR_PERMISSION_DENIED); + } else { + g_free(q->log); + q->log =3D g_strdup(value); + } +} + +static char *qtest_get_log(Object *obj, Error **errp) +{ + QTest *q =3D QTEST(obj); + + return g_strdup(q->log); +} + +static void qtest_set_chardev(Object *obj, const char *value, Error **errp) +{ + QTest *q =3D QTEST(obj); + Chardev *chr; + + if (q->complete) { + error_setg(errp, QERR_PERMISSION_DENIED); + return; + } + + chr =3D qemu_chr_find(value); + if (!chr) { + error_setg(errp, "Cannot find character device '%s'", value); + return; + } + + g_free(q->chr_name); + q->chr_name =3D g_strdup(value); + q->chr =3D chr; +} + +static char *qtest_get_chardev(Object *obj, Error **errp) +{ + QTest *q =3D QTEST(obj); + + return g_strdup(q->chr_name); +} + +static void qtest_class_init(ObjectClass *oc, void *data) +{ + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + + ucc->complete =3D qtest_complete; + + object_class_property_add_str(oc, "chardev", + qtest_get_chardev, qtest_set_chardev); + object_class_property_add_str(oc, "log", + qtest_get_log, qtest_set_log); +} + +static const TypeInfo qtest_info =3D { + .name =3D TYPE_QTEST, + .parent =3D TYPE_OBJECT, + .class_init =3D qtest_class_init, + .instance_size =3D sizeof(QTest), + .interfaces =3D (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } +}; + +static void register_types(void) +{ + type_register_static(&qtest_info); +} + +type_init(register_types); diff --git a/softmmu/vl.c b/softmmu/vl.c index 0f7222af31..e5f3c42049 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1685,8 +1685,9 @@ static bool object_create_early(const char *type, Qem= uOpts *opts) * add one, state the reason in a comment! */ =20 - /* Reason: rng-egd property "chardev" */ - if (g_str_equal(type, "rng-egd")) { + /* Reason: property "chardev" */ + if (g_str_equal(type, "rng-egd") || + g_str_equal(type, "qtest")) { return false; } =20 --=20 2.26.2