From nobody Sun May 5 18:06:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612375293; cv=none; d=zohomail.com; s=zohoarc; b=Yiw6Kxd4mBcQU0h4oFKQz5aMNdXY167GGMDT8EXA1tpSifPGK3o7vh4AyyA3rMELDfAWXurBnXfLE0pB+HY6rShzpvOd4QHN3GKZ2EH9b3yofux7P5p1DbgFsF1d4kiYoWXGZsf+DMdhv/zm+duTKsnPy4ukgYfmDEp2yGH6xuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612375293; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/7Cu7Q5lym4DBa1cg8EAWwUiATZ5xrce3dx+iPEyWjs=; b=QXTUnJP62oe7m94xqwF2/iFCk+/r/P/MvIK0/aj6CrpfM6ycFGwSrT5Udl0v0jG2Iaf59bgiU8DKLwo5XUtXeYBqRX/IkaPDlRUOFvWHlQrMqQbiNd3JebhOcDmA6pI+PBEJdfvGtk+NlC9rDso8czglMtpjtxiAyvnsA3RmwSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612375293703182.42367810257792; Wed, 3 Feb 2021 10:01:33 -0800 (PST) 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-498-zeNk7Ob-OJ6SP-mK6TF-3w-1; Wed, 03 Feb 2021 13:01:29 -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 79351801972; Wed, 3 Feb 2021 18:01:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA22E5DA2E; Wed, 3 Feb 2021 18:01:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2347D57DFA; Wed, 3 Feb 2021 18:01:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 113I1IaS027691 for ; Wed, 3 Feb 2021 13:01:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id A41385B697; Wed, 3 Feb 2021 18:01:18 +0000 (UTC) Received: from antique-work.lan (unknown [10.40.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E6AE7A381 for ; Wed, 3 Feb 2021 18:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612375291; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/7Cu7Q5lym4DBa1cg8EAWwUiATZ5xrce3dx+iPEyWjs=; b=i/N9rpHRRMvEonsZuJkxatcTAeUjS0IB56jIVqmXIB4w3Td4dsLIkn8lhHefRJRMoeVKZn CDkpR7NNBLABDwttHkBG15zBp+jn5N4oqUp/inOMpOtQEkxoUZenptyNS+pH5fgnfkTZ1U slR/rORehAYBSlitpbRdwxy1kTG8XAk= X-MC-Unique: zeNk7Ob-OJ6SP-mK6TF-3w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH] qemu_monitor_json: fix JSON generator for VC chardev Date: Wed, 3 Feb 2021 19:01:11 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The correct backend type is 'vc', same as in qemuBuildChrChardevStr() where we generate qemu command line. Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor_json.c | 5 ++++- tests/qemumonitorjsontest.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 97c5e5b36c..231f0ded32 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7438,10 +7438,13 @@ qemuMonitorJSONAttachCharDevCommand(const char *chr= ID, =20 switch ((virDomainChrType)chr->type) { case VIR_DOMAIN_CHR_TYPE_NULL: - case VIR_DOMAIN_CHR_TYPE_VC: backend_type =3D "null"; break; =20 + case VIR_DOMAIN_CHR_TYPE_VC: + backend_type =3D "vc"; + break; + case VIR_DOMAIN_CHR_TYPE_PTY: backend_type =3D "pty"; break; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 29c396891b..956423f10f 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -718,7 +718,7 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr = xmlopt, =20 chr =3D (virDomainChrSourceDef) { .type =3D VIR_DOMAIN_CHR_TYPE_VC }; CHECK("vc", false, - "{'id':'alias','backend':{'type':'null','data':{}}}"); + "{'id':'alias','backend':{'type':'vc','data':{}}}"); =20 chr =3D (virDomainChrSourceDef) { .type =3D VIR_DOMAIN_CHR_TYPE_PTY }; if (qemuMonitorJSONTestAttachOneChardev(xmlopt, schema, "pty", &chr, --=20 2.29.2