From nobody Sun Feb 8 14:53:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602677642; cv=none; d=zohomail.com; s=zohoarc; b=B/rxIy1E6uYwuowHhfkBEjnozIQQywBLo5KZZlb5rD8QNijZ2LtkBAUbYRKOet688XHMZN3k+q0+qTvVhmkbmSgUIOtjZT0lJsHifMa+x/kFCCxJa9BoXR9cRbzrL9JIHhCrqQFSXrBhnL4r51zAdyUTq9k8PxiW2NT5heS6uIE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602677642; 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=t0zrZnk/mtyFuALg4bVX3ckcLL+sGEU01fnMcB+jN4s=; b=T5Rz9blk5wctBykcvkYcV0HiIJyyZmG+X7bHO9aWZiY+BI5Jfxq0tY2+XLXU7d7PODyBTMx8eqI5JYY0sjzWigrRrm2jBvHZw9XxSwOXIAf9d0fNPDDLxJ85WdnJXS1TMRbOCeHEWJ3mau4KDOdNPZh1Mlp9nYHmbnYPinRKacQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1602677642521180.09477321681425; Wed, 14 Oct 2020 05:14:02 -0700 (PDT) Received: from localhost ([::1]:42766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSffN-0006v1-3x for importer@patchew.org; Wed, 14 Oct 2020 08:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSfd1-0004zg-36 for qemu-devel@nongnu.org; Wed, 14 Oct 2020 08:11:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kSfcy-0003Ll-SU for qemu-devel@nongnu.org; Wed, 14 Oct 2020 08:11:34 -0400 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-132-zuLVuwXEOh2cAqKZOL1CmA-1; Wed, 14 Oct 2020 08:11:30 -0400 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 3E8A818BE16D for ; Wed, 14 Oct 2020 12:11:29 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id C94D55D9CD; Wed, 14 Oct 2020 12:11:22 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F3F5F43BFB8; Wed, 14 Oct 2020 14:11:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602677491; 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=t0zrZnk/mtyFuALg4bVX3ckcLL+sGEU01fnMcB+jN4s=; b=HTLk83JFFUPwCmW+zCCwyGOWbav7feA5zsWAAWy1Yakmy3nXrbihcb/6QUzSXxCfeQcJcM 5OeBEG/tT2pKdXNdNLptjAN0pi/KpTtaDydqxmo2BFHIlb7b9A2cHN+4HrGZCu+l/J9KwW 4ABxqw5F9i8FITZzm9vN6vFyT5jsPuY= X-MC-Unique: zuLVuwXEOh2cAqKZOL1CmA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 2/7] ui/spice-app: don't use qemu_chr_open_spice_port directly Date: Wed, 14 Oct 2020 14:11:15 +0200 Message-Id: <20201014121120.13482-3-kraxel@redhat.com> In-Reply-To: <20201014121120.13482-1-kraxel@redhat.com> References: <20201014121120.13482-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/14 03:37:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=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: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Save the parent object's open function pointer in the (new) VCChardevClass struct instead before overwriting it, so we can look it up when needed. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- ui/spice-app.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ui/spice-app.c b/ui/spice-app.c index 93e105c6ee82..7e0550c79fdd 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -44,11 +44,15 @@ static char *sock_path; struct VCChardev { SpiceChardev parent; }; -typedef struct VCChardev VCChardev; + +struct VCChardevClass { + ChardevClass parent; + void (*parent_open)(Chardev *chr, ChardevBackend *backend, + bool *be_opened, Error **errp); +}; =20 #define TYPE_CHARDEV_VC "chardev-vc" -DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) +OBJECT_DECLARE_TYPE(VCChardev, VCChardevClass, CHARDEV_VC) =20 static ChardevBackend * chr_spice_backend_new(void) @@ -66,6 +70,7 @@ static void vc_chr_open(Chardev *chr, bool *be_opened, Error **errp) { + VCChardevClass *vc =3D CHARDEV_VC_GET_CLASS(chr); ChardevBackend *be; const char *fqdn =3D NULL; =20 @@ -80,7 +85,7 @@ static void vc_chr_open(Chardev *chr, be =3D chr_spice_backend_new(); be->u.spiceport.data->fqdn =3D fqdn ? g_strdup(fqdn) : g_strdup_printf("org.qemu.console.%s", chr->label= ); - qemu_chr_open_spice_port(chr, be, be_opened, errp); + vc->parent_open(chr, be, be_opened, errp); qapi_free_ChardevBackend(be); } =20 @@ -91,8 +96,11 @@ static void vc_chr_set_echo(Chardev *chr, bool echo) =20 static void char_vc_class_init(ObjectClass *oc, void *data) { + VCChardevClass *vc =3D CHARDEV_VC_CLASS(oc); ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 + vc->parent_open =3D cc->open; + cc->parse =3D qemu_chr_parse_vc; cc->open =3D vc_chr_open; cc->chr_set_echo =3D vc_chr_set_echo; @@ -103,6 +111,7 @@ static const TypeInfo char_vc_type_info =3D { .parent =3D TYPE_CHARDEV_SPICEPORT, .instance_size =3D sizeof(VCChardev), .class_init =3D char_vc_class_init, + .class_size =3D sizeof(VCChardevClass), }; =20 static void spice_app_atexit(void) --=20 2.27.0