From nobody Tue Nov 26 17:34:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567201476; cv=none; d=zoho.com; s=zohoarc; b=Wg23uHScvh+LbZZzmAlGiXSMiWY6KVSVacpFVF0bxFeDwcAqc5C7QYLkpCyJqKo3I5VLwqxSoDS0MEqJ5T7jCiUN4X3LzDX8e9aFINrjvEHpmnGq3VfMY2jPELfDKZw6JYM3O3gz5jBarMAcppuuAQirGdwK58w7v8J4fNp7xTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567201476; 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:ARC-Authentication-Results; bh=0RAoo0XZ1tIhDkRY12dlbZFhchBnzSLTHNW+3pxCCLU=; b=dm5wo5Tv4HQNXHpdoIDEDHyZizxnctttwIiGtQzjZNCe00jkBwRXmJ7hBkPHFROEWH761XMkfvR8o4i7ClJa/l0wa1Ae8vEhuGaW5SNrSxmzp/6J0IOKDhZt4uYaGTzVe7S8QsLUkkGFruhTRJd+37BLZzWa82ojiKFqGah3OfY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567201476948694.0476060724966; Fri, 30 Aug 2019 14:44:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1407307D985; Fri, 30 Aug 2019 21:44:35 +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 AE69360F80; Fri, 30 Aug 2019 21:44:35 +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 7AEBB24F32; Fri, 30 Aug 2019 21:44:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7ULhbEI005542 for ; Fri, 30 Aug 2019 17:43:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id B28DE100195C; Fri, 30 Aug 2019 21:43:37 +0000 (UTC) Received: from mx1.redhat.com (ext-mx25.extmail.prod.ext.phx2.redhat.com [10.5.110.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD76E1001959 for ; Fri, 30 Aug 2019 21:43:35 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE76610F23F7 for ; Fri, 30 Aug 2019 21:43:34 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id 4so7485979qki.6 for ; Fri, 30 Aug 2019 14:43:34 -0700 (PDT) Received: from localhost.localdomain ([191.17.58.35]) by smtp.gmail.com with ESMTPSA id y25sm2970689qtf.83.2019.08.30.14.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 14:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6NAaZJPzqDZBwMyzBJNnkUzrC0jAMtzxMWJJ+xMX0lU=; b=JqSdDSSXnNWqwJNLEt5xN2BGpF8/J1LIkVKG/k3eeiHjSlyH8H8TgE8CU2WJz2GcYY uTBj3Cocp1jZ3E+dCFwGY57XCipNTWsxhiwAG8pv6mAequJ28HAQDvu8etKwVQGFNpOz +2wOrkmphG2XJxqRQACaw9IgzVS9q9VkshgNobm7TcuVuOl6MSrI4Xc1700sN+BwGQBR G9BuZ9K4mY00sx2HfqQoQ4qQWVEXldYxwCDRNyIdb5pd7XPqafRf1ksF/UJs0IYYd98p /tkkdWS3ak+o4y7Dh27zkNrIQr3gfNvTTYZvRtXU+metDDEF0kplqraQdbovVS22tmSh r+iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6NAaZJPzqDZBwMyzBJNnkUzrC0jAMtzxMWJJ+xMX0lU=; b=AzIBAQVD7PziNwBTShiaZY2zqH2dXLE6/aAtzgL4m6xL/xDc7QFoCvOA5+UCI7hui4 luJo2Y6zr0TJETJIx3yurTK1FHqES6ipVqYMuz3yhemGveImOu45va1IHWa8O2QIAPCP DJGO2eM4ss8dZqKh7JkR2eAuhJJBrCaJfqqxgcz5lXFfGFklmNPTodSxWfTTtMVOGmPM Nwv4H1aH/Fq4MVMvPPGHYV9EJccBEYd8nmcdBrkh/ruByHOp9CXqbGCZLWWJKuxeozT9 v1oxPlTVNWnA9s3myU7Arbrvi59Mj9OcSLk0Z10vYy+bdFKNX5OLq5Ou+pL8J1tVBNwR fDoQ== X-Gm-Message-State: APjAAAV/okfDYq73c71oO4kPr95B3a4l2jgk420OdIMUNAvLffTRUULA E2QTDK6o9/PI88n7g+pe2E7bOxf7 X-Google-Smtp-Source: APXvYqzjppQhsGpZOgTdRGbAfA5HD3/R/oSda7Eov9yozGmml1OsZAipnno+cBntDSwFrDeyDIdEuA== X-Received: by 2002:a37:a5c1:: with SMTP id o184mr16772124qke.365.1567201413849; Fri, 30 Aug 2019 14:43:33 -0700 (PDT) From: jcfaracco@gmail.com To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 18:40:53 -0300 Message-Id: <20190830214101.8759-2-jcfaracco@gmail.com> In-Reply-To: <20190830214101.8759-1-jcfaracco@gmail.com> References: <20190830214101.8759-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Fri, 30 Aug 2019 21:43:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Fri, 30 Aug 2019 21:43:34 +0000 (UTC) for IP:'209.85.222.193' DOMAIN:'mail-qk1-f193.google.com' HELO:'mail-qk1-f193.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.1 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.193 mail-qk1-f193.google.com 209.85.222.193 mail-qk1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.66 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Julio Faracco Subject: [libvirt] [PATCH v2 01/10] docs: Adding 'xres' and 'yres' into video XML definition 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 30 Aug 2019 21:44:36 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Julio Faracco This commit adds resolution element with parameters 'x' and 'y' into video XML domain group definition. Both, properties were added into an element called 'resolution' and it was added inside 'model' element. They are=20 set as optional. This element does not follow QEMU properties 'xres'=20 and 'yres' format. Signed-off-by: Julio Faracco --- docs/schemas/domaincommon.rng | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c48f8c4f56..7b6468c36e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3637,6 +3637,16 @@ + + + + + + + + + + --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Nov 26 17:34:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567201480; cv=none; d=zoho.com; s=zohoarc; b=W1PkkGNL54sFM8FyjH84TzOSfOL/jcAGOjP6JHlOoR2BxKuTBcJeIoggM2hBEEy+fw3ld2p7D9HxGs3Z1399JjiCAgV3MiDh/RvCmHyfkUMhKIy76UZ7mN3wn783R049FBFbXIlnk/BX3GuJZzrp8oXGnF9aWmWb4jJjlam3RsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567201480; 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:ARC-Authentication-Results; bh=t0oT7ie8wjzVIiC2zgNp4iOVZ7nvBpIEJG0VmrJhxoY=; b=XE//Cjf/kvLVKgIB/hcXSS5d6fQwBGSOY4euuJIt3SXjqJn0/hMrE/TtOPTwGWfReFz4J3ZlRnE5wVlZtmw6033x7JhvhcZnwjjq8Kxfbh9V3AnCF6ZV3Y36oyiKcxztwb5mHJ1umsTkF6UWjHG9Iz1YY2YkTvPFfVbvi32ujRM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567201480260818.5436452746304; Fri, 30 Aug 2019 14:44:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 21075317528A; Fri, 30 Aug 2019 21:44:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E714760606; Fri, 30 Aug 2019 21:44:38 +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 AFB4E1806B01; Fri, 30 Aug 2019 21:44:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7ULhkpm005556 for ; Fri, 30 Aug 2019 17:43:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 081CE5C221; Fri, 30 Aug 2019 21:43:46 +0000 (UTC) Received: from mx1.redhat.com (ext-mx29.extmail.prod.ext.phx2.redhat.com [10.5.110.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 034185C207 for ; Fri, 30 Aug 2019 21:43:43 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1470C18B20E8 for ; Fri, 30 Aug 2019 21:43:43 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id m10so7524872qkk.1 for ; Fri, 30 Aug 2019 14:43:43 -0700 (PDT) Received: from localhost.localdomain ([191.17.58.35]) by smtp.gmail.com with ESMTPSA id y25sm2970689qtf.83.2019.08.30.14.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 14:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4927VCzMi32mhDxPO703rQSHal119WGP4uGdwrmf84o=; b=uWadPFWGgt3GP12Yf76kMkUqbccmm9ON4FSbkgbb6WbIUXUM47Adtg27DLYwqqzZtI k83JbNYHNJH3FK5VF2TwWyycd4JVfmYf+GvO5ygdOn4Q/b+tothBJx+umbo9LuE+Ojla iwkhPJDQOkADQBcnR9k+dx3rI2A1fldpr3vMtgYZ8Al/gwC8OyvDhop+cidv3p6W1kRB AD8igeVYG4i/X9PoF+CpQDjoB0jAXm5i5xN/a3OsPrszRFVUUBu61SxMyNgtRUBobafD m8M1wj+8y3yhDWaEKvnaEhT+9nK5+I9qHss2tF4ktbiYp9E/snwH9NtbVpc8uBAMRoat uPVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4927VCzMi32mhDxPO703rQSHal119WGP4uGdwrmf84o=; b=avmUnnOM7jfraf4shIXN+YrSAlXPUir1ubjDXd0iX1/oDXTKg6j9AgpFj2rzyPXuKG rFBjTNMgZLBKC6zOCgZquyPy8Qa8miRszvi7Y1rQ+IXiz5wJYpq9Vo6gwG0kaCHQISOT p9mt78wAeJJyk/fVtr9s41NDo0T4P9N6VqgxEnlzuaeGzmhjZcu8iHHfeYKMtgm/ItmK MYU8i2RCi0239xuEGFbY5C4vr1oWagPDWksLloN/8Yu4O0yzyvngVx3lHO5QKAEWWVyU G1mx//XXDvOQ4axWRcwyivE1yxOfPuecnIqTG1WKYRErcu+NS37lYmTWsb2nLgUK9Zpd LI5g== X-Gm-Message-State: APjAAAXYBJyGU0zEw4/Bz78FJNyxEc9lFG7YGBAe40lolWeNBiy2ZBNn PK0sNa8NgXTDhw8MZddMmnFY5KVX X-Google-Smtp-Source: APXvYqypKYnleM8pJM2MANr/inzzIkauBuJhWdPYuULq2AEO+VfR2H0AJP88s20xPJlUSnEOoxrLJg== X-Received: by 2002:ae9:e102:: with SMTP id g2mr17434778qkm.182.1567201422093; Fri, 30 Aug 2019 14:43:42 -0700 (PDT) From: jcfaracco@gmail.com To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 18:40:54 -0300 Message-Id: <20190830214101.8759-3-jcfaracco@gmail.com> In-Reply-To: <20190830214101.8759-1-jcfaracco@gmail.com> References: <20190830214101.8759-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Fri, 30 Aug 2019 21:43:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Fri, 30 Aug 2019 21:43:43 +0000 (UTC) for IP:'209.85.222.193' DOMAIN:'mail-qk1-f193.google.com' HELO:'mail-qk1-f193.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.1 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.193 mail-qk1-f193.google.com 209.85.222.193 mail-qk1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.70 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Julio Faracco Subject: [libvirt] [PATCH v2 02/10] qemu: Include {xres, yres} QEMU capabilities for video models 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 30 Aug 2019 21:44:39 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Julio Faracco New QEMU capabilities for display resolution were added: xres and yres. Some models supports like VGA, QXL, Virtio and Bochs support set resolution for driver. The capabilities mentioned above were added into those models. Signed-off-by: Julio Faracco --- src/qemu/qemu_capabilities.c | 16 ++++++++++++++++ src/qemu/qemu_capabilities.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 73300128ea..e6d256a9cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -537,6 +537,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 335 */ "bochs-display", "migration-file-drop-cache", + "xres", + "yres", ); =20 =20 @@ -1219,6 +1221,8 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevic= ePropsKVMPit[] =3D { =20 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVGA[] =3D { { "vgamem_mb", QEMU_CAPS_VGA_VGAMEM }, + { "xres", QEMU_CAPS_XRES }, + { "yres", QEMU_CAPS_YRES }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVmwareSvga[] = =3D { @@ -1229,6 +1233,8 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevic= ePropsQxl[] =3D { { "vgamem_mb", QEMU_CAPS_QXL_VGAMEM }, { "vram64_size_mb", QEMU_CAPS_QXL_VRAM64 }, { "max_outputs", QEMU_CAPS_QXL_MAX_OUTPUTS }, + { "xres", QEMU_CAPS_XRES }, + { "yres", QEMU_CAPS_YRES }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioGpu[] =3D= { @@ -1237,6 +1243,13 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevi= cePropsVirtioGpu[] =3D { { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY }, { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM }, { "ats", QEMU_CAPS_VIRTIO_PCI_ATS }, + { "xres", QEMU_CAPS_XRES }, + { "yres", QEMU_CAPS_YRES }, +}; + +static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsBochs[] =3D { + { "xres", QEMU_CAPS_XRES }, + { "yres", QEMU_CAPS_YRES }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsICH9[] =3D { @@ -1362,6 +1375,9 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDevicePr= ops[] =3D { { "virtio-gpu-device", virQEMUCapsDevicePropsVirtioGpu, ARRAY_CARDINALITY(virQEMUCapsDevicePropsVirtioGpu), QEMU_CAPS_DEVICE_VIRTIO_GPU }, + { "bochs-display", virQEMUCapsDevicePropsBochs, + ARRAY_CARDINALITY(virQEMUCapsDevicePropsBochs), + QEMU_CAPS_DEVICE_BOCHS_DISPLAY }, { "ICH9-LPC", virQEMUCapsDevicePropsICH9, ARRAY_CARDINALITY(virQEMUCapsDevicePropsICH9), -1 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 68ef6c49b4..5e3d542994 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -518,6 +518,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 335 */ QEMU_CAPS_DEVICE_BOCHS_DISPLAY, /* -device bochs-display */ QEMU_CAPS_MIGRATION_FILE_DROP_CACHE, /* migration with disk cache on i= s safe for type=3D'file' disks */ + QEMU_CAPS_XRES, /* -device *,xres=3D */ + QEMU_CAPS_YRES, /* -device *,yres=3D */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Nov 26 17:34:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567201458; cv=none; d=zoho.com; s=zohoarc; b=a8FOWkna8SZ69xeboaLvLYFNK+gwvpk9A7AkwgiGvKM+thAe5Ooau8l+6mdJmmI37BOarWnUIxuVcHsO7EUq3XJQY2Xus11ztEDJD2UAQ1yPHn7M6kppPc/L855/BXla0pbNi6o/nb6x5odOcuuQme1HhU6ZJPABebrVrHvkcH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567201458; 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:ARC-Authentication-Results; bh=KfptEOwZuAs+6Z8qeMEyNWGOYj3ufO63lmWSun5jHEM=; b=RX+AJUbYcpGGMyANoVVEMCRNImstIt7e6NAdgTlX7QUbajLBqTDFwMHAFlfEl1WbEKeHIO/aMKfl//sIPZsUFbbqIQMvz44Km/12QTlQa9zb2jfgaWIZ4FIfGxAusZZggzSyYJGhP+JLA32vFADP0WhDt+0gm8pl2g1OOizd76c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567201458063127.1230280890336; Fri, 30 Aug 2019 14:44:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9734518AF93B; Fri, 30 Aug 2019 21:44:16 +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 749B85C207; Fri, 30 Aug 2019 21:44:16 +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 401F424F31; Fri, 30 Aug 2019 21:44:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7ULhnKJ005568 for ; Fri, 30 Aug 2019 17:43:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id A6D2F19D7A; Fri, 30 Aug 2019 21:43:49 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A14A719C6A for ; Fri, 30 Aug 2019 21:43:46 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B09AA64467 for ; Fri, 30 Aug 2019 21:43:45 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id y26so9278934qto.4 for ; Fri, 30 Aug 2019 14:43:45 -0700 (PDT) Received: from localhost.localdomain ([191.17.58.35]) by smtp.gmail.com with ESMTPSA id y25sm2970689qtf.83.2019.08.30.14.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 14:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pkVVkEViVxcCmzqD+4+OiqdN2FwLY6+gEqrwyMlwn+U=; b=tkWGE/ocDsGprl/3u8K8Wlp6XyakuAfahTIQL++7BJoKvdMg0skK6XaGr9uT4jDBPe JnDkkJ63kK2iwbZ387RVy3GgtH9IgtWEU5idQXt8pe++Z/Wy39RfEbRNanoMg2a9uQ5p obNpCtPQB0zIsizVxbZz48chFPHW8e9vWlZXMXpRFg9HMtkSZzCVVoEJJiCJn8/PljYD rLEL/tgewIn0czSi3lqk0ZAkCRbXTGhw/7QbCsFLBV/gpgT8XAQ3Iim+CC4+OSTak/sc Q5YsjQ6Gkims+Y3I54P1X+EbTFsgKrQ/NsV4UhTwZ0UlAQ5sqJPwGkoKoT5fHRAre7gA dkoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pkVVkEViVxcCmzqD+4+OiqdN2FwLY6+gEqrwyMlwn+U=; b=Enlq1Itey/roqovc3dkW+1En3Xlzp80x7+W1fhpJ5KBb+EIWFg0liqMXm338R4dhe8 dMMzP9mAiGlqdIXkdpVbh/4l7PrYS4J0Em52Wd9kWd8daBoPAkkRl9ZA0tkTRJnusUAn OuzOpfXqNwiogYbWHqOHPvNn46ycLrJLyzfrRln62Zrm/KZF8GqRIin5BiQYvtv21uTp bKSJxkZ2DM8qLEU7/en6BT/+492B5EDtLVzgBbwBtFZrCR35bmGSLngFzzy1Hv/7MEIK Q1f8rYoYbMpXYL0N70keDZA6lqco+pixxJmaIo4iFr9LuurOV9/mAt0c89tqHKODqOJz aNvw== X-Gm-Message-State: APjAAAVZTvbRl24mWga9W0iBSgrNHbz9Zx8mtjIEUzLkgnj5X8aBSTKc 0dh8cym+3wdNT/WtxRPYZEE3fQba X-Google-Smtp-Source: APXvYqxq2azjnJJir1sGXFY5ogUs9qB5TBy0ukDtT+bVxxNMZ5feD1pxnjRXF3eseFJdhPbR1WsfTw== X-Received: by 2002:a0c:df12:: with SMTP id g18mr11324000qvl.34.1567201424675; Fri, 30 Aug 2019 14:43:44 -0700 (PDT) From: jcfaracco@gmail.com To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 18:40:55 -0300 Message-Id: <20190830214101.8759-4-jcfaracco@gmail.com> In-Reply-To: <20190830214101.8759-1-jcfaracco@gmail.com> References: <20190830214101.8759-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 30 Aug 2019 21:43:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 30 Aug 2019 21:43:45 +0000 (UTC) for IP:'209.85.160.195' DOMAIN:'mail-qt1-f195.google.com' HELO:'mail-qt1-f195.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.099 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS) 209.85.160.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Julio Faracco Subject: [libvirt] [PATCH v2 03/10] conf: Adding resolution property for model element 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Fri, 30 Aug 2019 21:44:17 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Julio Faracco New element 'resolution' with parameters 'x' and 'y' were added to support this settings for VGA, QXL, Virtio and Bochs XMLs. A new structure was created as Acceleration element has. It is easy to parse this property. Example: Signed-off-by: Julio Faracco --- src/conf/domain_conf.c | 75 ++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 5 +++ src/conf/virconftypes.h | 3 ++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b7a342bb91..9db8fd9697 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15311,6 +15311,53 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) return def; } =20 +static virDomainVideoResolutionDefPtr +virDomainVideoResolutionDefParseXML(xmlNodePtr node) +{ + xmlNodePtr cur; + virDomainVideoResolutionDefPtr def; + VIR_AUTOFREE(char *) x =3D NULL; + VIR_AUTOFREE(char *) y =3D NULL; + + cur =3D node->children; + while (cur !=3D NULL) { + if (cur->type =3D=3D XML_ELEMENT_NODE) { + if (!x && !y && + virXMLNodeNameEqual(cur, "resolution")) { + x =3D virXMLPropString(cur, "x"); + y =3D virXMLPropString(cur, "y"); + } + } + cur =3D cur->next; + } + + if (!x || !y) + return NULL; + + if (VIR_ALLOC(def) < 0) + goto cleanup; + + if (x) { + if (virStrToLong_uip(x, NULL, 10, &def->x) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot parse video x-resolution '%s'"), x); + goto cleanup; + } + } + + if (y) { + if (virStrToLong_uip(y, NULL, 10, &def->y) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot parse video y-resolution '%s'"), y); + goto cleanup; + } + } + + cleanup: + return def; +} + + static virDomainVideoDriverDefPtr virDomainVideoDriverDefParseXML(xmlNodePtr node) { @@ -15389,6 +15436,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xml= opt, } =20 def->accel =3D virDomainVideoAccelDefParseXML(cur); + def->res =3D virDomainVideoResolutionDefParseXML(cur); } if (virXMLNodeNameEqual(cur, "driver")) { if (virDomainVirtioOptionsParseXML(cur, &def->virtio) < 0) @@ -15463,6 +15511,17 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xm= lopt, } } =20 + if (def->res) { + if (def->type !=3D VIR_DOMAIN_VIDEO_TYPE_VGA && + def->type !=3D VIR_DOMAIN_VIDEO_TYPE_QXL && + def->type !=3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO && + def->type !=3D VIR_DOMAIN_VIDEO_TYPE_BOCHS) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("model resolution is not supported")); + goto error; + } + } + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 @@ -26443,6 +26502,18 @@ virDomainVideoAccelDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } =20 +static void +virDomainVideoResolutionDefFormat(virBufferPtr buf, + virDomainVideoResolutionDefPtr def) +{ + virBufferAddLit(buf, "x && def->y) { + virBufferAsprintf(buf, " x=3D'%u' y=3D'%u'", + def->x, def->y); + } + virBufferAddLit(buf, "/>\n"); +} + static int virDomainVideoDefFormat(virBufferPtr buf, virDomainVideoDefPtr def, @@ -26486,11 +26557,13 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " heads=3D'%u'", def->heads); if (def->primary) virBufferAddLit(buf, " primary=3D'yes'"); - if (def->accel) { + if (def->accel || def->res) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); if (def->accel) virDomainVideoAccelDefFormat(buf, def->accel); + if (def->res) + virDomainVideoResolutionDefFormat(buf, def->res); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); } else { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 33cef5b75c..a164f26d57 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1407,6 +1407,10 @@ struct _virDomainVideoAccelDef { int accel3d; /* enum virTristateBool */ }; =20 +struct _virDomainVideoResolutionDef { + unsigned int x; + unsigned int y; +}; =20 struct _virDomainVideoDriverDef { virDomainVideoVGAConf vgaconf; @@ -1422,6 +1426,7 @@ struct _virDomainVideoDef { bool primary; virDomainVideoAccelDefPtr accel; virDomainVideoDriverDefPtr driver; + virDomainVideoResolutionDefPtr res; virDomainDeviceInfo info; virDomainVirtioOptionsPtr virtio; }; diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h index a15cfb5f9e..462842f324 100644 --- a/src/conf/virconftypes.h +++ b/src/conf/virconftypes.h @@ -324,6 +324,9 @@ typedef virDomainVcpuDef *virDomainVcpuDefPtr; typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; =20 +typedef struct _virDomainVideoResolutionDef virDomainVideoResolutionDef; +typedef virDomainVideoResolutionDef *virDomainVideoResolutionDefPtr; + typedef struct _virDomainVideoDef virDomainVideoDef; typedef virDomainVideoDef *virDomainVideoDefPtr; =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Nov 26 17:34:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567201483; cv=none; d=zoho.com; s=zohoarc; b=dKva3GRhPcShFiRMVXXEMTUkR26FxOZbtcUVN7VhyKlSj/rqMeTs0Q+PNTXGmBAhLljiLw0SviOxIry57jyfudlX9ucvVoeuUzX5UKGVnn942WiNdeb4guTJMhMc8rYsxvmuLpuz/wgmMqh+CjS7K8aq5elvLzySC9EA4fEoRcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567201483; 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:ARC-Authentication-Results; bh=5YtORsNKo46CVeZpjHuofgOWa73+JJkmh4VxuO4yT34=; b=hMXXZUn+9SAg1jQtzdgG2L9EVnzxNcevvAjbfZcnFqUjiJxrGl3W7O0Je8n4a3SM/OGzRtGwDBC4/9gJA67fjXEavBe3LMYFqTJ/c0l5wZkYmSnJVuCsVCGjHGI1LYEZRNb9JqzKAbR2eRwPa87fPuF6tEAMfsh2T6AjuFDORf8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567201483529811.9374900329582; Fri, 30 Aug 2019 14:44:43 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A7DD18C4265; Fri, 30 Aug 2019 21:44:42 +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 066923DE1; Fri, 30 Aug 2019 21:44:42 +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 C445E24F33; Fri, 30 Aug 2019 21:44:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7ULhopW005573 for ; Fri, 30 Aug 2019 17:43:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id EBA1060605; Fri, 30 Aug 2019 21:43:50 +0000 (UTC) Received: from mx1.redhat.com (ext-mx29.extmail.prod.ext.phx2.redhat.com [10.5.110.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E5197608A5 for ; Fri, 30 Aug 2019 21:43:48 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0440F18C891E for ; Fri, 30 Aug 2019 21:43:48 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id b11so9239174qtp.10 for ; Fri, 30 Aug 2019 14:43:47 -0700 (PDT) Received: from localhost.localdomain ([191.17.58.35]) by smtp.gmail.com with ESMTPSA id y25sm2970689qtf.83.2019.08.30.14.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 14:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D9ES0j/1YqVtSKv3pWf8pZ/S2r4c0ilnIeTAUyPRkBE=; b=bUx8wlZlLVsubZWgITuYd9joAq3QqAR+aKmJox6u34cyMhkJF91N7zDtx8jwo/VHl/ WXxfJMTR/j1GmglxVm2ujlJwOv2GdsjAOM3ok0aluc5SwGs7MzkX/TUZY+/7eY1LcAxf zo8e8u9PE0bOrywSbzzcDkcy06YUdIkUm12TmnDKOYXw2VJEdmwZRVVlPy+VCYjZTtpB +018JPI+n5jIc63QQWGzrFWGWJZwdjlRSwk7S/tk+817SBpuCth4K3xmqHwmplO2Z1Kk wjIzo2YWCwC6T7USvK4rtsNP5N/sUfV8Qd0F1ctaAtjzVoBWukcgPP4zZwcHmJ8Pbr9+ uFSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D9ES0j/1YqVtSKv3pWf8pZ/S2r4c0ilnIeTAUyPRkBE=; b=UcefaYBO4UgPHXiMNeqCyRKQgOBc5gc0TrYLP02jrSaiv8H3RYK2D+Hheggh2aXXcY /FqxNCBjEebLhgmDAvIeMx/T4g2ata7BMU28mQVChC1jJWi+SDJyUpuF/cB8xr6FgVMh 5f+cYE54zsF2nvzijQdhrtuHzvRZLMvVTaDfM2ogBE2jqkHSGZUMiBpR7bfXeEczGE6o fMvcynnaZBhuse3c/Npst4WC+W6hdinyNdux24/hH5LVPTSPWsTAZxOZ7vrWqUyiOB6F z4nZAEv6p0ROInx0LhZ5V51LLfeU4BecuzvVRS1BMn41hnzR4VsXGjDD5CGHdnWPU/8l U3ew== X-Gm-Message-State: APjAAAWAxqaiz+vFPHGa3JJ4xO6vGvLd12DwmlwwCFHwqTb2yOdznCIj aXJjFgt/SdJ4MDMtYIB7576N0gZx X-Google-Smtp-Source: APXvYqysU55ydoS4a+Fjv3cri0PHoMmymQE4DyNS3RMor3ErxqnhDGXUEvYDKX6Xd9l6N86shpjXjg== X-Received: by 2002:ac8:2f81:: with SMTP id l1mr4866874qta.269.1567201427014; Fri, 30 Aug 2019 14:43:47 -0700 (PDT) From: jcfaracco@gmail.com To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 18:40:56 -0300 Message-Id: <20190830214101.8759-5-jcfaracco@gmail.com> In-Reply-To: <20190830214101.8759-1-jcfaracco@gmail.com> References: <20190830214101.8759-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Fri, 30 Aug 2019 21:43:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Fri, 30 Aug 2019 21:43:48 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.097 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.70 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Julio Faracco Subject: [libvirt] [PATCH v2 04/10] qemu: Include {xres, yres} for QEMU command line 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Fri, 30 Aug 2019 21:44:42 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Julio Faracco Display devices can use now properties 'xres' and 'yres' by QEMU command line. Only models specified by their QEMU capabilities. This commit includes VGA, QXL, Virtio and Bochs. Signed-off-by: Julio Faracco --- src/qemu/qemu_command.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1ca1ecd2f0..566e34a2c7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4564,6 +4564,11 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virBufferAsprintf(&buf, ",vram_size=3D%u", video->vram * 1024); } =20 + if (video->res && video->res->x && video->res->y) { + /* QEMU accepts resolution xres and yres. */ + virBufferAsprintf(&buf, ",xres=3D%u,yres=3D%u", video->res->x,= video->res->y); + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VRAM64)) { /* QEMU accepts mebibytes for vram64_size_mb. */ virBufferAsprintf(&buf, ",vram64_size_mb=3D%u", video->vram64 = / 1024); @@ -4583,15 +4588,30 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, if (video->heads) virBufferAsprintf(&buf, ",max_outputs=3D%u", video->heads); } + + if (video->res && video->res->x && video->res->y) { + /* QEMU accepts resolution xres and yres. */ + virBufferAsprintf(&buf, ",xres=3D%u,yres=3D%u", video->res->x,= video->res->y); + } } else if ((video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VMVGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VMWARE_SVGA_VGAMEM))) { if (video->vram) virBufferAsprintf(&buf, ",vgamem_mb=3D%u", video->vram / 1024); + + if (video->res && video->res->x && video->res->y) { + /* QEMU accepts resolution xres and yres. */ + virBufferAsprintf(&buf, ",xres=3D%u,yres=3D%u", video->res->x,= video->res->y); + } } else if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_BOCHS) { if (video->vram) virBufferAsprintf(&buf, ",vgamem=3D%uk", video->vram); + + if (video->res && video->res->x && video->res->y) { + /* QEMU accepts resolution xres and yres. */ + virBufferAsprintf(&buf, ",xres=3D%u,yres=3D%u", video->res->x,= video->res->y); + } } =20 if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Nov 26 17:34:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567201435; cv=none; d=zoho.com; s=zohoarc; b=JyU3pgg02dYu/zibna8M05uRbCuuI4kHXeZNy5iMeJ7tl/3XyY2Mc52diATIpime3nbXncBI7fPC+dSqtART43SgqtOvxbnQatPUbS4A5voo9rmt2ewqTJlJAr7hvTrEZBRMEsViYMxTeGMduWzAZwxzfEtmyx5aXMc+/l2Td94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567201435; 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:ARC-Authentication-Results; bh=VMzkJh21twdZJK5bqyT2/Q4zlBOWcAb6goLIzSfppU0=; b=oqcl09tD9y07NlWUbNaXaxUB/nIvE+MhIewFzji6dFdqJIoWYvI1A0Au1c8G1XR9vogKpQ0grOoe86vRbJvpek40CGoDtYPySXlOY6l/vF1e9Cf3x6Hvk8lJ9yplIaSLKl6inQsivhbMyvCOG945PbA860hA6/0nmR82LZhBMBI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567201435524950.8550064295725; Fri, 30 Aug 2019 14:43:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E8C1317528A; Fri, 30 Aug 2019 21:43:54 +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 DE8D7608A5; Fri, 30 Aug 2019 21:43:53 +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 9CBD32551C; Fri, 30 Aug 2019 21:43:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7ULhpgX005578 for ; Fri, 30 Aug 2019 17:43:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 67FE65C207; Fri, 30 Aug 2019 21:43:51 +0000 (UTC) Received: from mx1.redhat.com (ext-mx28.extmail.prod.ext.phx2.redhat.com [10.5.110.69]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6322C5C1D4 for ; Fri, 30 Aug 2019 21:43:51 +0000 (UTC) Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0ACDF877A6D for ; Fri, 30 Aug 2019 21:43:50 +0000 (UTC) Received: by mail-qk1-f174.google.com with SMTP id f13so7432766qkm.9 for ; Fri, 30 Aug 2019 14:43:50 -0700 (PDT) Received: from localhost.localdomain ([191.17.58.35]) by smtp.gmail.com with ESMTPSA id y25sm2970689qtf.83.2019.08.30.14.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 14:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/2/aWPLrffrN61kDAamIr7oLs3CRNVSkJQrlkRbAdjA=; b=NLZW1IC2BAqtqU2fSZ7VOilDpOBkJKQuv5oi9dB3Zvgds6WEt4tIP7j83C7ZoNeMp9 3I+Nt0sOROeMEMyIve8TMoyG5bf29wQvmcLgFXz/RNIYqribc2F8JLMjFqWFLkmCpBAS XKLNa8CW2OGujNbY5toa+f3g1oyPsVUKEkoHMdYvXdVFqMudnMPKBN57I1FW+crAfa62 4hZ/9JOriMXypK4yEKQott9ELKhKup1OhlZ9DywiC3gJ1OjDdy23j0OXT9x6hUep6zA9 tg0U1C2P1McAhFPSw/K2Cl6VAZHNdKU+noLaWjwZPLqw0/nhrl+4RZOzCD/XXdxJNZiB RMBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/2/aWPLrffrN61kDAamIr7oLs3CRNVSkJQrlkRbAdjA=; b=SjluDubm/96FcfCRBSu+oxKCUDW7oYIPNAmdp38OqOSUypL5ketxJr891FJP2hEeBG ZY3fhPeNfx5XrnxzRSooXpL75US7ZTnpV0y5dC7eYGbOWvFCrgKyMYBNUFz1n6ga1RfG nwVszYjtcSjAzDYZfbr97Pom+7/xj0ydhjwol06f9ogOwwd8LuHjVdHU8xFFqainJ06L pC2cJb2HTkEkKgs+b03v3ymKLR6GDEodC5E7pr2gM39lYv3cRHI7qaSxAUm14zDS3fdK Ri/opjPaApUWYOPUXxIplB7vyGWMeKWa8YmvD91C0Ix8QXH8JBJNw1kvuU0UaiBf0nc9 iLVA== X-Gm-Message-State: APjAAAVstla1PqwMboU9Jl6Z4794g8/78I9vfd7VgBkCJENX8daNfc7e nIpaYxA0Tt026Th3uu6TJNv/x699 X-Google-Smtp-Source: APXvYqyhqo+Io52UIOTf6U90Ezn407H7EQQgzwBi+tZgXpcnCrMRdCL11uB3npreoFe1iTrRbGDZTg== X-Received: by 2002:a37:4d02:: with SMTP id a2mr17867821qkb.63.1567201428919; Fri, 30 Aug 2019 14:43:48 -0700 (PDT) From: jcfaracco@gmail.com To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 18:40:57 -0300 Message-Id: <20190830214101.8759-6-jcfaracco@gmail.com> In-Reply-To: <20190830214101.8759-1-jcfaracco@gmail.com> References: <20190830214101.8759-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Fri, 30 Aug 2019 21:43:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Fri, 30 Aug 2019 21:43:50 +0000 (UTC) for IP:'209.85.222.174' DOMAIN:'mail-qk1-f174.google.com' HELO:'mail-qk1-f174.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.099 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS) 209.85.222.174 mail-qk1-f174.google.com 209.85.222.174 mail-qk1-f174.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.69 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Julio Faracco Subject: [libvirt] [PATCH v2 05/10] tests: Include {xres, yres} QEMU capabilities into tests 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 30 Aug 2019 21:43:54 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Julio Faracco Both resolution capabilities were added for QEMU versions: 2.10, 2.11, 2.12, 3.0.0, 3.10 and 4.0.0. Signed-off-by: Julio Faracco --- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 ++ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 ++ tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 ++ tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 2 ++ tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 2 ++ tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 ++ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 ++ tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 ++ tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 ++ tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 2 ++ tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 ++ tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 2 ++ tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 2 ++ tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 ++ tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 ++ tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 2 ++ 24 files changed, 48 insertions(+) diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index 9404e66144..0dc2268068 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -139,6 +139,8 @@ + + 2010000 0 61700805 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index 162fb1f035..29def35d43 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -138,6 +138,8 @@ + + 2010000 0 42900805 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index 21b918f8d4..e4c0afb6e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -103,6 +103,8 @@ + + 2010000 0 39100805 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index 2788fd9afe..d4b7a88c8a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -181,6 +181,8 @@ + + 2010000 0 43100805 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 6cb997d299..e1dd982a3e 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -110,6 +110,8 @@ + + 2011000 0 39100806 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.11.0.x86_64.xml index 69f7fc2e4a..9e020f0e8e 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -187,6 +187,8 @@ + + 2011000 0 43100806 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index 614fd14fb1..5b8469816b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -153,6 +153,8 @@ + + 2012000 0 61700807 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index fd9ae0bcb8..e2b7a55e47 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -151,6 +151,8 @@ + + 2011090 0 42900807 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index 2930381068..b91c038ab8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -121,6 +121,8 @@ + + 2012000 0 39100807 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 61b3602c48..b6632a7553 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -195,6 +195,8 @@ + + 2011090 0 43100807 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index 61be1df782..c72b61193a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -152,6 +152,8 @@ + + 2012050 0 42900757 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv32.xml index 865becc179..e8336c1fa4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -92,6 +92,8 @@ + + 3000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv64.xml index eb54aeaff3..a71ae8ab0b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -92,6 +92,8 @@ + + 3000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.s390x.xml index d511377262..19e18a9e10 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -123,6 +123,8 @@ + + 3000000 0 39100757 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index 7a322030bd..bbd0fc348b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -199,6 +199,8 @@ + + 3000000 0 43100757 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 400dc45be4..36a620e25e 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -157,6 +157,8 @@ + + 3000091 0 42900758 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index 434c644ad4..280c015472 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -202,6 +202,8 @@ + + 3000092 0 43100758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 20f119665b..d177651ce9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -165,6 +165,8 @@ + + 4000000 0 61700758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index 9ea6f4d046..d16d36ee03 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -170,6 +170,8 @@ + + 4000000 0 42900758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index 7503c2dbcd..022e5207e2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -168,6 +168,8 @@ + + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index 4a94179ee7..f91cf38924 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -168,6 +168,8 @@ + + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index ef802f3d1f..787ab92be0 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -132,6 +132,8 @@ + + 4000000 0 39100758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 87c95f4d18..5849b4c341 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -207,6 +207,8 @@ + + 4000000 0 43100758 diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index f4583d7fe7..77b148a580 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -209,6 +209,8 @@ + + 4000050 0 43100759 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Nov 26 17:34:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567201487; cv=none; d=zoho.com; s=zohoarc; b=LZ7DM8n2kzC3JroBxdvZXKGfVZ2jPySQYpzG51eu5T0UPlfqkYBOHRBl96DfbcZcC/7TEvoklGkaFIHai8WUr0UJkA/kw77Ef/9kzA/ZR7LRMw5obHEHYVUV5QVIiveZNFr0z5bi3y5MNtYuM3etUrsLT8f9J8LavTC8xrfso/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567201487; 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:ARC-Authentication-Results; bh=cis1OBtTag9gu0RQNGguvLgCQaqiHk75SD5AEoqgVNg=; b=CjA1RqzNvZMihMhPZPn4TQp3h6/iueNGeR7GIYh9e0w6Wn4a5bEhHGijGk+lxnyWobAnySa7oy0yMSzj31ceBY80fa5UeyOudnX3eTdKTwWr0XsBQQoJQ9Br7KlZZaOg9S/xcIhPdBlloYU4YHJarW2i9+vMEyg5gQQyQnrSPWQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156720148739275.28933931182348; Fri, 30 Aug 2019 14:44:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07CD810C697D; Fri, 30 Aug 2019 21:44:46 +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 CF56760606; Fri, 30 Aug 2019 21:44:45 +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 99C1624F35; Fri, 30 Aug 2019 21:44:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7ULhwpO005608 for ; Fri, 30 Aug 2019 17:43:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9A8755C221; Fri, 30 Aug 2019 21:43:58 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 927E55C1D4 for ; Fri, 30 Aug 2019 21:43:57 +0000 (UTC) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9BE0CC087353 for ; Fri, 30 Aug 2019 21:43:54 +0000 (UTC) Received: by mail-qt1-f176.google.com with SMTP id n7so9254679qtb.6 for ; Fri, 30 Aug 2019 14:43:54 -0700 (PDT) Received: from localhost.localdomain ([191.17.58.35]) by smtp.gmail.com with ESMTPSA id y25sm2970689qtf.83.2019.08.30.14.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 14:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O6879ElNPBiEAYQ2mQOLWkz57jd7zVPd0p8N3Z9NepM=; b=NUqh5XlatQjH4OYTHd9GX29p7VlhdYDIP4GJsmBWQlCSneOb3oNkvm7XyPo79SGbf5 wK/WEjkV3lURPoBRdMgIVd9QiESEdXiFqEmuLr/CG/bp0CDMo+GOF3ILHrYnz1uJIg1G kjuUQ0Zvo6yOTujNfKZBgfjFdS/mphpX3+gFdyQATtFh3Rk1py1W7LAlDmnpv3rdchZQ 5j7TO+0Mp5cp5UlaSrUmkv/+uu6C8k6pYzeh4cVSmRSMbfB+KkIw2U9pB6UepSEKwH07 S7dS7EYFz2nreyaYu5jQJsOlfMzWWg64GupfN3CHJMaHojParmDb3UTtg4uIec9IXLPY wUFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O6879ElNPBiEAYQ2mQOLWkz57jd7zVPd0p8N3Z9NepM=; b=mzv2xGcI5PNBpGMUpGhF5Gbo7SD7ikZM9QV/45DFJOnZuwqTECW3v2iuUohbpWmhvc 63U6QUx5+CRIk9YcINlIqMH0Bfv2Ah4/pRnX2VtdQv3dxyfdd0BCdxjRkYHJxz6gd4fy S2QBl7JFfSWEbBpePkU8xw2+pqkHng98VmzjWdFRieQya9BOH5dvH/iQ6kDg7zIYUJT9 2RWStf21GrTRISIKOTEjIx09Q6S7yTAJNO5CkFl0tdCNrwFeUkg4Y2KXesfnE/RNiQbB HwZjDG9C/2q/xXc+fFa6Wuz6nZL9QUAro0nb2cH5eSflyEjTV5HyIhonS9su7sa4o117 ZUvA== X-Gm-Message-State: APjAAAVxeEJFSAHtPFs1d+wqxvAl0ae5+5j7IkYMNPLXj8npOPG+f87M yfRd+4vj+3rnbdPpPNaF+24aYu3J X-Google-Smtp-Source: APXvYqyyZyXiPA2NxbkiLgd72BSd2J44EvRNcqt+8fJdoIfFooF3kk3lZ+36LlNBODTxiUX9DDFKVA== X-Received: by 2002:a0c:8c8f:: with SMTP id p15mr11575431qvb.57.1567201432663; Fri, 30 Aug 2019 14:43:52 -0700 (PDT) From: jcfaracco@gmail.com To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 18:40:58 -0300 Message-Id: <20190830214101.8759-7-jcfaracco@gmail.com> In-Reply-To: <20190830214101.8759-1-jcfaracco@gmail.com> References: <20190830214101.8759-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 30 Aug 2019 21:43:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 30 Aug 2019 21:43:54 +0000 (UTC) for IP:'209.85.160.176' DOMAIN:'mail-qt1-f176.google.com' HELO:'mail-qt1-f176.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.099 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS) 209.85.160.176 mail-qt1-f176.google.com 209.85.160.176 mail-qt1-f176.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Julio Faracco Subject: [libvirt] [PATCH v2 06/10] tests: Include bochs-display as capability test too 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Fri, 30 Aug 2019 21:44:46 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Julio Faracco The display model 'bochs-display' should be added into capability test case of command 'device-list-properties' because we are supporting this display now. It is listed by 'virQEMUCapsDeviceProps'. See src/qemu/qemu_capabilities.c:1378. Signed-off-by: Julio Faracco --- .../caps_3.0.0.ppc64.replies | 139 +++++++++++---- .../caps_3.0.0.x86_64.replies | 167 +++++++++++++----- .../caps_3.1.0.ppc64.replies | 139 +++++++++++---- .../caps_3.1.0.x86_64.replies | 167 +++++++++++++----- .../caps_4.0.0.aarch64.replies | 139 +++++++++++---- .../caps_4.0.0.ppc64.replies | 139 +++++++++++---- .../caps_4.0.0.riscv32.replies | 131 +++++++++++--- .../caps_4.0.0.riscv64.replies | 131 +++++++++++--- .../caps_4.0.0.x86_64.replies | 167 +++++++++++++----- .../caps_4.1.0.x86_64.replies | 159 ++++++++++++----- 10 files changed, 1114 insertions(+), 364 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_3.0.0.ppc64.replies index fa370a39bd..c3c9cdac53 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -4963,13 +4963,88 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-24" } =20 { - "id": "libvirt-24", + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-24" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-25" +} + +{ + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4981,7 +5056,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-26" } =20 { @@ -5124,7 +5199,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-26" } =20 { @@ -5132,11 +5207,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-27" } =20 { - "id": "libvirt-26", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5148,7 +5223,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -5192,7 +5267,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -5200,7 +5275,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5280,7 +5355,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5288,7 +5363,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5346,7 +5421,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5354,7 +5429,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5404,7 +5479,7 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5412,7 +5487,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -5462,12 +5537,12 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -5610,7 +5685,7 @@ "cpu-max": 1 } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -5618,7 +5693,7 @@ "arguments": { "typename": "pseries-3.0-machine" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -5789,12 +5864,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -7990,35 +8065,35 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -9148,12 +9223,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -9223,12 +9298,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -21387,7 +21462,7 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_3.0.0.x86_64.replies index b2ec8d75d3..7309d25fe6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -4227,11 +4227,86 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-27" } =20 +{ + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-27" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4325,7 +4400,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -4333,7 +4408,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4476,7 +4551,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4484,11 +4559,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { - "id": "libvirt-29", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4500,7 +4575,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4544,7 +4619,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4552,7 +4627,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4632,7 +4707,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4640,7 +4715,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4679,7 +4754,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4687,7 +4762,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4730,7 +4805,7 @@ "type": "int32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4738,7 +4813,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -4772,7 +4847,7 @@ "type": "uint64" } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 =20 @@ -4781,7 +4856,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -4831,7 +4906,7 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -4839,7 +4914,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -4889,7 +4964,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -4897,7 +4972,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -5951,12 +6026,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -6165,12 +6240,12 @@ "cpu-max": 255 } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -6607,12 +6682,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-41" } =20 { @@ -6620,12 +6695,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-41" } =20 { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-42" } =20 { @@ -6633,12 +6708,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-42" } =20 { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-43" } =20 { @@ -7937,12 +8012,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-43" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-44" } =20 { @@ -8012,12 +8087,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-43" + "id": "libvirt-44" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-45" } =20 { @@ -19897,16 +19972,16 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-45" } =20 { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-46" } =20 { - "id": "libvirt-45", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -19921,7 +19996,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -20114,7 +20189,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -20309,7 +20384,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { @@ -20572,7 +20647,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { @@ -20586,7 +20661,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } =20 { @@ -20779,7 +20854,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } =20 { @@ -20974,7 +21049,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } =20 { @@ -21237,7 +21312,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_3.1.0.ppc64.replies index 33666a43db..e16bd1574e 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -5017,13 +5017,88 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-24" } =20 { - "id": "libvirt-24", + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-24" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-25" +} + +{ + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5035,7 +5110,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-26" } =20 { @@ -5178,7 +5253,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-26" } =20 { @@ -5186,11 +5261,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-27" } =20 { - "id": "libvirt-26", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5202,7 +5277,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -5246,7 +5321,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -5254,7 +5329,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5334,7 +5409,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5342,7 +5417,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5400,7 +5475,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5408,7 +5483,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5469,7 +5544,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5477,7 +5552,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -5537,12 +5612,12 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -5690,7 +5765,7 @@ "cpu-max": 1 } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -5698,7 +5773,7 @@ "arguments": { "typename": "pseries-3.1-machine" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -5872,12 +5947,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -8073,35 +8148,35 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -9236,12 +9311,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -9311,12 +9386,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -21184,7 +21259,7 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_3.1.0.x86_64.replies index b8b117ffaf..2c22eefc43 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -4270,11 +4270,86 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-27" } =20 +{ + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-27" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4368,7 +4443,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -4376,7 +4451,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4519,7 +4594,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4527,11 +4602,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { - "id": "libvirt-29", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4543,7 +4618,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4587,7 +4662,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4595,7 +4670,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4675,7 +4750,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4683,7 +4758,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4722,7 +4797,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4730,7 +4805,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4773,7 +4848,7 @@ "type": "int32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4781,7 +4856,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -4815,7 +4890,7 @@ "type": "uint64" } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -4823,7 +4898,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -4884,7 +4959,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -4892,7 +4967,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -4952,7 +5027,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -4960,7 +5035,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -6062,12 +6137,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -6286,12 +6361,12 @@ "cpu-max": 255 } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -6810,12 +6885,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-41" } =20 { @@ -6823,12 +6898,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-41" } =20 { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-42" } =20 { @@ -6836,12 +6911,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-42" } =20 { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-43" } =20 { @@ -8115,12 +8190,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-43" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-44" } =20 { @@ -8190,12 +8265,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-43" + "id": "libvirt-44" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-45" } =20 { @@ -20380,16 +20455,16 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-45" } =20 { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-46" } =20 { - "id": "libvirt-45", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -20404,7 +20479,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -20606,7 +20681,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -20810,7 +20885,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { @@ -21085,7 +21160,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { @@ -21099,7 +21174,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } =20 { @@ -21301,7 +21376,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } =20 { @@ -21505,7 +21580,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } =20 { @@ -21780,7 +21855,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_4.0.0.aarch64.replies index 91943860b1..58c40ebbf3 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies @@ -5380,13 +5380,88 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-25" } =20 { - "id": "libvirt-25", + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-25" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-26" +} + +{ + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5398,7 +5473,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-27" } =20 { @@ -5550,7 +5625,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-27" } =20 { @@ -5558,11 +5633,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-28" } =20 { - "id": "libvirt-27", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5574,7 +5649,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5627,7 +5702,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5635,7 +5710,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5715,7 +5790,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5723,7 +5798,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5788,7 +5863,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5796,7 +5871,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -5860,12 +5935,12 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -6207,7 +6282,7 @@ "cpu-max": 1 } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -6215,7 +6290,7 @@ "arguments": { "typename": "virt-4.0-machine" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -6350,12 +6425,12 @@ "type": "string" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -6546,34 +6621,34 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -7721,12 +7796,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -7800,12 +7875,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -19892,12 +19967,12 @@ ] } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { "execute": "query-gic-capabilities", - "id": "libvirt-40" + "id": "libvirt-41" } =20 { @@ -19913,7 +19988,7 @@ "kernel": false } ], - "id": "libvirt-40" + "id": "libvirt-41" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_4.0.0.ppc64.replies index baa8f8963d..273265b528 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies @@ -5369,13 +5369,88 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-25" } =20 { - "id": "libvirt-25", + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-25" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-26" +} + +{ + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5387,7 +5462,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-27" } =20 { @@ -5539,7 +5614,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-27" } =20 { @@ -5547,11 +5622,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-28" } =20 { - "id": "libvirt-27", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5563,7 +5638,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5616,7 +5691,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -5624,7 +5699,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5704,7 +5779,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -5712,7 +5787,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5770,7 +5845,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -5778,7 +5853,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -5843,7 +5918,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -5851,7 +5926,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -5915,12 +5990,12 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -6073,7 +6148,7 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -6081,7 +6156,7 @@ "arguments": { "typename": "pseries-4.0-machine" }, - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -6280,12 +6355,12 @@ "type": "string" } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -8481,34 +8556,34 @@ "static": false } ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -9651,12 +9726,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -9730,12 +9805,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-41" } =20 { @@ -21793,7 +21868,7 @@ ] } ], - "id": "libvirt-40" + "id": "libvirt-41" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/= qemucapabilitiesdata/caps_4.0.0.riscv32.replies index c2ca623a0b..6f57e09f38 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -3554,13 +3554,88 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-26" } =20 { - "id": "libvirt-26", + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-26" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-27" +} + +{ + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3572,7 +3647,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -3724,7 +3799,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -3732,11 +3807,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { - "id": "libvirt-28", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3748,7 +3823,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -3801,7 +3876,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -3809,7 +3884,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -3889,7 +3964,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -3897,7 +3972,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -3962,7 +4037,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -3970,7 +4045,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4034,12 +4109,12 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4076,7 +4151,7 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4084,7 +4159,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -4189,34 +4264,34 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -5488,12 +5563,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -5567,12 +5642,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -17851,5 +17926,5 @@ ] } ], - "id": "libvirt-39" + "id": "libvirt-40" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/= qemucapabilitiesdata/caps_4.0.0.riscv64.replies index 0cccbdb4e0..a21bd4837b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -3554,13 +3554,88 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-26" } =20 { - "id": "libvirt-26", + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-26" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-27" +} + +{ + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3572,7 +3647,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -3724,7 +3799,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -3732,11 +3807,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { - "id": "libvirt-28", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3748,7 +3823,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -3801,7 +3876,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -3809,7 +3884,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -3889,7 +3964,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -3897,7 +3972,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -3962,7 +4037,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -3970,7 +4045,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4034,12 +4109,12 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4076,7 +4151,7 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4084,7 +4159,7 @@ "arguments": { "typename": "virt-machine" }, - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -4189,34 +4264,34 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -5488,12 +5563,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -5567,12 +5642,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -17851,5 +17926,5 @@ ] } ], - "id": "libvirt-39" + "id": "libvirt-40" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_4.0.0.x86_64.replies index b155e2a242..21d0e0a04f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -4468,11 +4468,86 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-27" } =20 +{ + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-27" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4566,7 +4641,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -4574,7 +4649,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4726,7 +4801,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4734,11 +4809,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { - "id": "libvirt-29", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4750,7 +4825,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4803,7 +4878,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4811,7 +4886,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4891,7 +4966,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4899,7 +4974,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4947,7 +5022,7 @@ "type": "uint8" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4955,7 +5030,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -4998,7 +5073,7 @@ "type": "int32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -5006,7 +5081,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -5040,7 +5115,7 @@ "type": "uint64" } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -5048,7 +5123,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -5113,7 +5188,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -5121,7 +5196,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -5185,7 +5260,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -5193,7 +5268,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -6311,12 +6386,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -6535,12 +6610,12 @@ "alias": "q35" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -7057,12 +7132,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-41" } =20 { @@ -7070,12 +7145,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-41" } =20 { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-42" } =20 { @@ -7083,12 +7158,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-42" } =20 { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-43" } =20 { @@ -8370,12 +8445,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-43" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-44" } =20 { @@ -8449,12 +8524,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-43" + "id": "libvirt-44" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-45" } =20 { @@ -20919,16 +20994,16 @@ ] } ], - "id": "libvirt-44" + "id": "libvirt-45" } =20 { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-46" } =20 { - "id": "libvirt-45", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -20943,7 +21018,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -21147,7 +21222,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -21353,7 +21428,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { @@ -21632,7 +21707,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { @@ -21646,7 +21721,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } =20 { @@ -21850,7 +21925,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } =20 { @@ -22056,7 +22131,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } =20 { @@ -22335,7 +22410,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_4.1.0.x86_64.replies index 516e7139bd..b363d5a56e 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies @@ -4509,11 +4509,86 @@ { "execute": "device-list-properties", "arguments": { - "typename": "ICH9-LPC" + "typename": "bochs-display" }, "id": "libvirt-27" } =20 +{ + "return": [ + { + "name": "yres", + "type": "uint32" + }, + { + "name": "xmax", + "type": "uint32" + }, + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or = 06", + "type": "int32" + }, + { + "name": "vgamem", + "type": "size" + }, + { + "name": "edid", + "type": "bool" + }, + { + "name": "ymax", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on\/off", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on\/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on\/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on\/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "xres", + "type": "uint32" + } + ], + "id": "libvirt-27" +} + +{ + "execute": "device-list-properties", + "arguments": { + "typename": "ICH9-LPC" + }, + "id": "libvirt-28" +} + { "return": [ { @@ -4607,7 +4682,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-28" } =20 { @@ -4615,7 +4690,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4767,7 +4842,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-29" } =20 { @@ -4775,11 +4850,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { - "id": "libvirt-29", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4791,7 +4866,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4844,7 +4919,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -4852,7 +4927,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4932,7 +5007,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -4940,7 +5015,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4988,7 +5063,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -4996,7 +5071,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -5039,7 +5114,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -5047,7 +5122,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -5081,7 +5156,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -5089,7 +5164,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -5154,7 +5229,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { @@ -5162,7 +5237,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -5226,7 +5301,7 @@ "type": "int" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -5234,7 +5309,7 @@ "arguments": { "typename": "max-x86_64-cpu" }, - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -6360,12 +6435,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -6599,12 +6674,12 @@ "cpu-max": 288 } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -7138,12 +7213,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-40" } =20 { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-41" } =20 { @@ -7151,12 +7226,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-41" } =20 { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-42" } =20 { @@ -7164,12 +7239,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-42" } =20 { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-43" } =20 { @@ -8439,12 +8514,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-43" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-44" } =20 { @@ -8518,12 +8593,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-43" + "id": "libvirt-44" } =20 { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-45" } =20 { @@ -21037,16 +21112,16 @@ ] } ], - "id": "libvirt-44" + "id": "libvirt-45" } =20 { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-46" } =20 { - "id": "libvirt-45", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SEV feature is not available" @@ -21061,7 +21136,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -21267,7 +21342,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-47" } =20 { @@ -21281,7 +21356,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { @@ -21487,7 +21562,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-48" } =20 { --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Nov 26 17:34:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1567201440; cv=none; d=zoho.com; s=zohoarc; b=EvxrbCBo/BPZDsqGCh90SAFZtgmyvyhvAkxfGW5ZgTSi8uRZG4H5TBU3j136NrZpb4Qv06uuvgvQ+rBBzFOpB+XL1La0WxJWYMJDmLGvMzx3geLs1rkjlMbfktCTlCklCiQ39grZbMKZC60x+OZr4QNK4Ubfe3702KN99+8ew74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567201440; 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:ARC-Authentication-Results; bh=YXLGO48C1C67p35dllkXmmXN1Q/e2lXcHmVMijh9rFw=; b=d0KrwTVkt8GoU1powOMIjF9XXAZUoT5LVYsIcIbZZ1Qf3n7H0wsR1LfMV+hkXGJrLxgOF+B3kZANfu8568hf09KLrBEMugHUww5g66czsnpj9iHBrjh3wNhZ7poWgGNwVRHXJDK7TBLd+3H06HikvUP/vibYE0TvmS/ES2fhRUc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567201440740443.3120897258509; Fri, 30 Aug 2019 14:44:00 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5D14218C893B; Fri, 30 Aug 2019 21:43:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36EBA600F8; Fri, 30 Aug 2019 21:43:59 +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 EDF131806B00; Fri, 30 Aug 2019 21:43:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7ULhuRV005598 for ; Fri, 30 Aug 2019 17:43:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B44C19D7A; Fri, 30 Aug 2019 21:43:56 +0000 (UTC) Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 646D519C6A for ; Fri, 30 Aug 2019 21:43:56 +0000 (UTC) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C4FE30832EA for ; Fri, 30 Aug 2019 21:43:55 +0000 (UTC) Received: by mail-qk1-f178.google.com with SMTP id c189so5928167qkg.2 for ; Fri, 30 Aug 2019 14:43:55 -0700 (PDT) Received: from localhost.localdomain ([191.17.58.35]) by smtp.gmail.com with ESMTPSA id y25sm2970689qtf.83.2019.08.30.14.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 14:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oo5LqXPt2nQR+qMmKTxzx1njDVM5mo2URunv/ir81e4=; b=P/m8tCM7+B2TUczwoNExEcHgPSSwzXdVOBtUFmzWT9E6dF+1wN7dqYJnmFblKScNo3 9T+AUS5pcVeu5m+s+i/ezWOcOMbNU3YdtnTlJXK0tIPCnLdmMpbVwvTyd3Al1zL+p5bC 0Akqqa6s52kb3kN7V2vFi56Klo6aFgL4ggdkKgqhG5X+ziu1fGEvOh/2515bj03hB+og hUG/5xFPiMvU56ZTB2QLF/UC5GEUBfgIhHY9wVtsMiaGozQB5whMd85S2K/y7+r+HBw0 LjCaKWod5sZqvTmo9LNoe4gt/sJLp4a3az1d+Het+JmbhHYXsHTP60X7thSAsvouLWUj 0fWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oo5LqXPt2nQR+qMmKTxzx1njDVM5mo2URunv/ir81e4=; b=RqJUC4aqA5tj7Qv2nOl+Yqo36DIzWG/H/Inmu8c5sDcMUZJxa73MjwlZnDpvV5g4TO eujk8EwmCejkFoeAYQxVoPsnW319LwRDe1zN+xL7NbvF+9LwQZQNDS9MAuPj/oONaTYl 1cVyd595tBXyFD4OMrn0deqIhwBY6Q+MW5GRPTcj3TXwgbyS0zgR1bcwfB81Mk/wrYIF pzKsaLGdqzM9OweFvgRINIQSfBU9TrQJcPUNjubqnTrtJDr72KG3aCc8/9cU1LvSYvPa XSUTge3WqX2XZ5Nk3gEg7GPz28KYW9rmcn8VvBpKslMddiE5TNW7tRKpRacc8yQqTDqv AAAA== X-Gm-Message-State: APjAAAVpyJHAML32cLO1WP/th/GmR2iTdMPdjzGK5pswohI2ts7uPxH/ 7JpzZAkqYaFlAP5u7DGn7oL8/U1G X-Google-Smtp-Source: APXvYqzppc9fO4yBQJAlSLHMuvyTNj0voNg5IdH3CKBIFg0bZW7rYuKLO2urCiXe91zV5dVKMwo5Gg== X-Received: by 2002:a05:620a:1391:: with SMTP id k17mr17842567qki.437.1567201434499; Fri, 30 Aug 2019 14:43:54 -0700 (PDT) From: jcfaracco@gmail.com To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 18:40:59 -0300 Message-Id: <20190830214101.8759-8-jcfaracco@gmail.com> In-Reply-To: <20190830214101.8759-1-jcfaracco@gmail.com> References: <20190830214101.8759-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 30 Aug 2019 21:43:55 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 30 Aug 2019 21:43:55 +0000 (UTC) for IP:'209.85.222.178' DOMAIN:'mail-qk1-f178.google.com' HELO:'mail-qk1-f178.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.099 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS) 209.85.222.178 mail-qk1-f178.google.com 209.85.222.178 mail-qk1-f178.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.44 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Julio Faracco Subject: [libvirt] [PATCH v2 07/10] tests: Introduce resolution test for QXL model 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Fri, 30 Aug 2019 21:43:59 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Julio Faracco New test case was added to cover 'xres' and 'yres' properties for QXL model due to latest QEMU version. Signed-off-by: Julio Faracco --- .../video-qxl-resolution.x86_64-latest.args | 35 +++++++++++++++++++ .../qemuxml2argvdata/video-qxl-resolution.xml | 33 +++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../video-qxl-resolution.x86_64-latest.xml | 33 +++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 103 insertions(+) create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.x86_64-late= st.args create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.xml create mode 100644 tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-la= test.xml diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args= b/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args new file mode 100644 index 0000000000..73036521c7 --- /dev/null +++ b/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 214 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,xres= =3D1280,\ +yres=3D720,vram64_size_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,ad= dr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml b/tests/qemuxm= l2argvdata/video-qxl-resolution.xml new file mode 100644 index 0000000000..3ecdbedc02 --- /dev/null +++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml @@ -0,0 +1,33 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + +
+ + + +