From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515587; cv=none; d=zoho.com; s=zohoarc; b=DhN49juk8+xjItVNrDpmjlu4fVlC7Hd+71Fz8FuiuqzqO2WsyZEsDqOmz4Y0poh6bQY2C9/69ldANTykCvD/R3TAsQZulHIb7FrtKGneS2kyzkempxl9ZW9QrvwLnm13NoX3cxMQ34rpHgtO1J+aGDTdNSBb/ND7DjIVkJoqsBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515587; 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=GabhmdV+pqgdfVRlMVgREZ29HTobf37NC5+Ni7YVF+0=; b=KwP7g3MZuLjVgiAeNeAP6Pwpy8huoySA2Q7CFJnsqhexcxLIt7uWu3J+JGxhiXqXehoxR7xIanHiOJp2MvQfnGRL14p9h26bLIO9NwWKQvl7eg/u4fVaewJ4ZBVOoEy+p4Nezma3FJmVZzyFogQmVAxTGdebvSrBWgh8bpEiyXs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1557515587203614.2910298440061; Fri, 10 May 2019 12:13:07 -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 777FC33025E; Fri, 10 May 2019 19:13:05 +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 49F73183C2; Fri, 10 May 2019 19:13:05 +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 E1B9818089D1; Fri, 10 May 2019 19:13:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJCwfl003655 for ; Fri, 10 May 2019 15:12:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E79B60126; Fri, 10 May 2019 19:12:58 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 927866015A; Fri, 10 May 2019 19:12:54 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:38 +0200 Message-Id: <20190510191245.32567-2-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 1/8] gconfig: Add _domain_os_set_firmware() 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-Type: text/plain; charset="utf-8" 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.29]); Fri, 10 May 2019 19:13:06 +0000 (UTC) Add a way to set to the domain XML. Signed-off-by: Fabiano Fid=C3=AAncio --- libvirt-gconfig/libvirt-gconfig-domain-os.c | 17 +++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-os.h | 7 +++++++ libvirt-gconfig/libvirt-gconfig.sym | 2 ++ tests/test-gconfig.c | 1 + tests/xml/gconfig-domain-os.xml | 2 +- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/= libvirt-gconfig-domain-os.c index ecbf5b3..62c3441 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -328,3 +328,20 @@ void gvir_config_domain_os_set_machine(GVirConfigDomai= nOs *os, const char *machi =20 xmlNewProp(os_type_node, (xmlChar*)"machine", (xmlChar*)machine); } + +void gvir_config_domain_os_set_firmware(GVirConfigDomainOs *os, GVirConfig= DomainOsFirmware firmware) +{ + xmlNodePtr node; + const gchar *firmware_str; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_OS(os)); + + node =3D gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(os)); + g_return_if_fail(node !=3D NULL); + + firmware_str =3D gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_OS= _FIRMWARE, + firmware); + g_warn_if_fail(firmware_str !=3D NULL); + + xmlNewProp(node, (xmlChar*)"firmware", (xmlChar*)firmware_str); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.h b/libvirt-gconfig/= libvirt-gconfig-domain-os.h index fe17dd4..2a8fc13 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.h @@ -77,6 +77,11 @@ typedef enum { GVIR_CONFIG_DOMAIN_OS_BOOT_DEVICE_NETWORK } GVirConfigDomainOsBootDevice; =20 +typedef enum { + GVIR_CONFIG_DOMAIN_OS_FIRMWARE_BIOS, + GVIR_CONFIG_DOMAIN_OS_FIRMWARE_EFI +} GVirConfigDomainOsFirmware; + GType gvir_config_domain_os_get_type(void); =20 GVirConfigDomainOs *gvir_config_domain_os_new(void); @@ -99,6 +104,8 @@ void gvir_config_domain_os_set_smbios_mode(GVirConfigDom= ainOs *os, GVirConfigDomainOsSmBiosMode mo= de); void gvir_config_domain_os_enable_boot_menu(GVirConfigDomainOs *os, gboole= an enable); void gvir_config_domain_os_bios_enable_serial(GVirConfigDomainOs *os, gboo= lean enable); +void gvir_config_domain_os_set_firmware(GVirConfigDomainOs *os, + GVirConfigDomainOsFirmware firmwar= e); =20 G_END_DECLS =20 diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-= gconfig.sym index 885e708..746fd1a 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -774,6 +774,8 @@ global: =20 LIBVIRT_GCONFIG_2.0.1 { global: + gvir_config_domain_os_firmware_get_type; + gvir_config_domain_os_set_firmware; gvir_config_storage_vol_target_features_get_type; gvir_config_storage_vol_target_set_features; } LIBVIRT_GCONFIG_2.0.0; diff --git a/tests/test-gconfig.c b/tests/test-gconfig.c index 3328297..fda4fcb 100644 --- a/tests/test-gconfig.c +++ b/tests/test-gconfig.c @@ -215,6 +215,7 @@ static void test_domain_os(void) gvir_config_domain_os_set_os_type(os, GVIR_CONFIG_DOMAIN_OS_TYPE_HVM); gvir_config_domain_os_set_arch(os, "x86_64"); gvir_config_domain_os_set_machine(os, "q35"); + gvir_config_domain_os_set_firmware(os, GVIR_CONFIG_DOMAIN_OS_FIRMWARE_= EFI); g_assert_cmpint(gvir_config_domain_os_get_os_type(os), =3D=3D, GVIR_CO= NFIG_DOMAIN_OS_TYPE_HVM); g_assert_cmpstr(gvir_config_domain_os_get_arch(os), =3D=3D, "x86_64"); g_assert_cmpstr(gvir_config_domain_os_get_machine(os), =3D=3D, "q35"); diff --git a/tests/xml/gconfig-domain-os.xml b/tests/xml/gconfig-domain-os.= xml index 56af776..690024d 100644 --- a/tests/xml/gconfig-domain-os.xml +++ b/tests/xml/gconfig-domain-os.xml @@ -1,5 +1,5 @@ - + hvm --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515582; cv=none; d=zoho.com; s=zohoarc; b=fPz5selQSokXIPzT/jvc3oEUV5CxerfUMfsz1kpv1IzrKCHAokQa4kKZlhKTHoMP02BlX1XgJtgy5Rf/XkXstcIzHj24QmErfsffj9oilMhJ/Ucaj9VVZ0srr6s44PM9orXLtAZgeEPFfxUp1J5eBnF16Wr6MN8X5yjrhvJf6gI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515582; 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=CwJf6h4RQ1LUX+EQJTGbakFd233a6kTr51Fc/tq9haY=; b=YebPfaT0MJEAam4cqb6fcSZTTXk2KsR5xJhKiXvWLSRGcbLUyWn83sNGVoV5jTOTuhCBfD3wmWqR/smUdse8C62tlAdMLP0yQ62wicqoHeRbd9hVQxxQ9U/GIacCnxlSzHtOIvfNB1zkwM8aXGA2ueZuhBa+aKMwoW6CIGKRPkc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1557515582909348.2629177541653; Fri, 10 May 2019 12:13:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DECE6307EA81; Fri, 10 May 2019 19:13:00 +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 B74C010018FB; Fri, 10 May 2019 19:13:00 +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 721E041F5B; Fri, 10 May 2019 19:13:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJCxun003660 for ; Fri, 10 May 2019 15:12:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2B73B6013B; Fri, 10 May 2019 19:12:59 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C5C460126; Fri, 10 May 2019 19:12:58 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:39 +0200 Message-Id: <20190510191245.32567-3-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 2/8] gobject: Use the proper return type in _connection_get_capabilities_finish() 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-Type: text/plain; charset="utf-8" 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 10 May 2019 19:13:01 +0000 (UTC) Instead of returning FALSE, return NULL. Signed-off-by: Fabiano Fid=C3=AAncio --- libvirt-gobject/libvirt-gobject-connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject= /libvirt-gobject-connection.c index 15b4709..e84ca6d 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -2177,7 +2177,7 @@ gvir_connection_get_capabilities_finish(GVirConnectio= n *conn, NULL); g_return_val_if_fail(g_task_get_source_tag(G_TASK(result)) =3D=3D gvir_connection_get_capabilities_async, - FALSE); + NULL); =20 return g_task_propagate_pointer(G_TASK(result), err); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515591; cv=none; d=zoho.com; s=zohoarc; b=ImS66SlptMBuaPx8FHYBcYbBLqRbp19vUZX2uU6Hc1XDqZNHJ0MQvNAno7RQGk8ElIuqs3YdvVV4+me88mZxGepIi2glVTe4oW68M9otzDQOp3viecw7Dz1o1/7uevpa9q8v7nf6WzbGlz/yzNL1ujA0rbvnr0YctcILL0QPf3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515591; 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=9LoMjl0lTz+blGHeDU3FpXnaVEBhAn+qbfXBkXw79OQ=; b=mQ+ldFe86R6AMEacXzFzSUnIAHegt4LOKzdNt7KkQmPajTZ6waE1msrpnAXr6UEeB7V5nI9TLNRy3Fuw0lHI7SWQKQytjwbROGrOw01NoPaIr8SnX/yrt9vdm5gnL5MobZVyWo8PUsUYBfpQa3/OWuFpMwK9NSydMgmdp2bhk5Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1557515591103998.0641421828338; Fri, 10 May 2019 12:13:11 -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 3BE28307D857; Fri, 10 May 2019 19:13:09 +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 F138960185; Fri, 10 May 2019 19:13:08 +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 A45A318089D9; Fri, 10 May 2019 19:13:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJD0Fc003670 for ; Fri, 10 May 2019 15:13:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 28BF660126; Fri, 10 May 2019 19:13:00 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 793566013B; Fri, 10 May 2019 19:12:59 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:40 +0200 Message-Id: <20190510191245.32567-4-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 3/8] gconfig: Add GVirConfigDomainCapabilities 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-Type: text/plain; charset="utf-8" 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.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 10 May 2019 19:13:09 +0000 (UTC) GVirConfigDomainCapabilities object has been introduced in order to represent the output of virConnectGetDomainCapabilities(). For now it's not used anywhere, but its addition allows us to start building the needed machinery for: - Creating a wrapper around virConnectGetDomainCapabilities(); - Creating new objects that will be used to return each of the elements present in the output of virConnectGetDomainCapabilities(), accordingly to the consumers of this library's need; Signed-off-by: Fabiano Fid=C3=AAncio --- libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-domain-capabilities.c | 71 +++++++++++++++++++ .../libvirt-gconfig-domain-capabilities.h | 67 +++++++++++++++++ libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 3 + 5 files changed, 144 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-capabilities.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-capabilities.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index b976e4d..db2fa79 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -26,6 +26,7 @@ GCONFIG_HEADER_FILES =3D \ libvirt-gconfig-domain-address.h \ libvirt-gconfig-domain-address-pci.h \ libvirt-gconfig-domain-address-usb.h \ + libvirt-gconfig-domain-capabilities.h \ libvirt-gconfig-domain-channel.h \ libvirt-gconfig-domain-chardev.h \ libvirt-gconfig-domain-chardev-source.h \ @@ -119,6 +120,7 @@ GCONFIG_SOURCE_FILES =3D \ libvirt-gconfig-domain-address.c \ libvirt-gconfig-domain-address-pci.c \ libvirt-gconfig-domain-address-usb.c \ + libvirt-gconfig-domain-capabilities.c \ libvirt-gconfig-domain-channel.c \ libvirt-gconfig-domain-chardev.c \ libvirt-gconfig-domain-chardev-source.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities.c b/libvir= t-gconfig/libvirt-gconfig-domain-capabilities.c new file mode 100644 index 0000000..3377889 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities.c @@ -0,0 +1,71 @@ +/* + * libvirt-gconfig-domain-capabilities.c: libvirt domain capabilities conf= iguration + * + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_CAPABILITIES_GET_PRIVATE(obj) = \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABI= LITIES, GVirConfigDomainCapabilitiesPrivate)) + +struct _GVirConfigDomainCapabilitiesPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCapabilities, gvir_config_domai= n_capabilities, GVIR_CONFIG_TYPE_OBJECT); + +static void +gvir_config_domain_capabilities_class_init(GVirConfigDomainCapabilitiesCla= ss *klass G_GNUC_UNUSED) +{ +} + + +static void +gvir_config_domain_capabilities_init(GVirConfigDomainCapabilities *domain_= caps) +{ + domain_caps->priv =3D GVIR_CONFIG_DOMAIN_CAPABILITIES_GET_PRIVATE(doma= in_caps); +} + + +GVirConfigDomainCapabilities * +gvir_config_domain_capabilities_new(void) +{ + GVirConfigObject *object; + + object =3D gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES, + "domainCapabilities", + DATADIR "/libvirt/schemas/domaincaps.r= ng"); + return GVIR_CONFIG_DOMAIN_CAPABILITIES(object); +} + +GVirConfigDomainCapabilities * +gvir_config_domain_capabilities_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object =3D gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CAP= ABILITIES, + "domainCapabilities", + DATADIR "/libvirt/schemas/dom= aincaps.rng", + xml, error); + return GVIR_CONFIG_DOMAIN_CAPABILITIES(object); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities.h b/libvir= t-gconfig/libvirt-gconfig-domain-capabilities.h new file mode 100644 index 0000000..965d2a4 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities.h @@ -0,0 +1,67 @@ +/* + * libvirt-gconfig-domain-capabilities.c: libvirt domain capabilities conf= iguration + * + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_CAPABILITIES_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_CAPABILITIES_H__ + +#include "libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.h" + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES (gvir_config_domai= n_capabilities_get_type ()) +#define GVIR_CONFIG_DOMAIN_CAPABILITIES(obj) (G_TYPE_CHECK_INST= ANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES, GVirConfigDomainCap= abilities)) +#define GVIR_CONFIG_DOMAIN_CAPABILITIES_CLASS(klass) (G_TYPE_CHECK_CLAS= S_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES, GVirConfigDomainCapa= bilitiesClass)) +#define GVIR_CONFIG_IS_DOMAIN_CAPABILITIES(obj) (G_TYPE_CHECK_INST= ANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES)) +#define GVIR_CONFIG_IS_DOMAIN_CAPABILITIES_CLASS(klass) (G_TYPE_CHECK_CLAS= S_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES)) +#define GVIR_CONFIG_DOMAIN_CAPABILITIES_GET_CLASS(obj) (G_TYPE_INSTANCE_G= ET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES, GVirConfigDomainCapa= bilitiesClass)) + +typedef struct _GVirConfigDomainCapabilities GVirConfigDomainCapabilities; +typedef struct _GVirConfigDomainCapabilitiesPrivate GVirConfigDomainCapabi= litiesPrivate; +typedef struct _GVirConfigDomainCapabilitiesClass GVirConfigDomainCapabili= tiesClass; + +struct _GVirConfigDomainCapabilities +{ + GVirConfigObject parent; + + GVirConfigDomainCapabilitiesPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainCapabilitiesClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_capabilities_get_type(void); + +GVirConfigDomainCapabilities *gvir_config_domain_capabilities_new(void); +GVirConfigDomainCapabilities *gvir_config_domain_capabilities_new_from_xml= (const gchar *xml, + = GError **error); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_CAPABILITIES_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gc= onfig.h index 6462154..9fde05a 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-= gconfig.sym index 746fd1a..4a13635 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -774,6 +774,9 @@ global: =20 LIBVIRT_GCONFIG_2.0.1 { global: + gvir_config_domain_capabilities_get_type; + gvir_config_domain_capabilities_new; + gvir_config_domain_capabilities_new_from_xml; gvir_config_domain_os_firmware_get_type; gvir_config_domain_os_set_firmware; gvir_config_storage_vol_target_features_get_type; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515587; cv=none; d=zoho.com; s=zohoarc; b=Q3nB86QdpBSZu/TkhKHZBRmYK82kFsCD45BrhVpHy7nrmkDKX+h10dsM95ASHMySV/bfwNuCCZsVVPstzWzTs8oDFzClLih4yQHwM25FzDtcenfYya+dQqW7+MO+a9LqsTvIPZR8LvT2xrNqRaomoMhU72SCuANZE0ID8vOf5nQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515587; 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=It3TLH5/2GO2h4NSmmE/Bg1E6CZ4xcEIUZxOLTTqsKI=; b=TfNxPJhp+eOA03g3NKd5kcITuPYntGGPwfI4IALg2YoKDvjX8kPxWPQuAXepCcRqH01rWYjtLucpvT+kb/aXQD3saGaHoZx5VL4hiTgv/u9rp613I1AIX1rilsomjubqiDkuHxxKUOxNS5FDxgJzP0RLtD9ABdk28ypwZVjcNa4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 155751558752336.639015287729876; Fri, 10 May 2019 12:13:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DDECC307EAA3; Fri, 10 May 2019 19:13:05 +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 B3EFE5D704; Fri, 10 May 2019 19:13:05 +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 6CA7141F3D; Fri, 10 May 2019 19:13:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJD1tj003680 for ; Fri, 10 May 2019 15:13:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 226C96013B; Fri, 10 May 2019 19:13:01 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 758A460126; Fri, 10 May 2019 19:13:00 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:41 +0200 Message-Id: <20190510191245.32567-5-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 4/8] gconfig: Add GVirConfigDomainCapabilitiesOs 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-Type: text/plain; charset="utf-8" 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 10 May 2019 19:13:06 +0000 (UTC) GVirConfigDomainCapabilitiesOs object has been introduced in order to represent the element under . For now it's not used anywhere, but it's addition allows us to start building the needed machinery for: - Returning a representation os element; - Having the most basic machinery to start adding functions to return any child element we may need to query from element; Signed-off-by: Fabiano Fid=C3=AAncio --- libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-domain-capabilities-os.c | 43 +++++++++++++ .../libvirt-gconfig-domain-capabilities-os.h | 61 +++++++++++++++++++ libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 1 + 5 files changed, 108 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index db2fa79..089b42a 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -27,6 +27,7 @@ GCONFIG_HEADER_FILES =3D \ libvirt-gconfig-domain-address-pci.h \ libvirt-gconfig-domain-address-usb.h \ libvirt-gconfig-domain-capabilities.h \ + libvirt-gconfig-domain-capabilities-os.h \ libvirt-gconfig-domain-channel.h \ libvirt-gconfig-domain-chardev.h \ libvirt-gconfig-domain-chardev-source.h \ @@ -121,6 +122,7 @@ GCONFIG_SOURCE_FILES =3D \ libvirt-gconfig-domain-address-pci.c \ libvirt-gconfig-domain-address-usb.c \ libvirt-gconfig-domain-capabilities.c \ + libvirt-gconfig-domain-capabilities-os.c \ libvirt-gconfig-domain-channel.c \ libvirt-gconfig-domain-chardev.c \ libvirt-gconfig-domain-chardev-source.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c b/lib= virt-gconfig/libvirt-gconfig-domain-capabilities-os.c new file mode 100644 index 0000000..d3b6e3c --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c @@ -0,0 +1,43 @@ +/* + * libvirt-gconfig-domain-capabilities-os.c: libvirt OS domain capabilities + * + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_CAPABILITIES_OS_GET_PRIVATE(obj) = \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABI= LITIES_OS, GVirConfigDomainCapabilitiesOsPrivate)) + +struct _GVirConfigDomainCapabilitiesOsPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCapabilitiesOs, gvir_config_dom= ain_capabilities_os, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_capabilities_os_class_init(GVirConfigDomain= CapabilitiesOsClass *klass G_GNUC_UNUSED) +{ +} + +static void gvir_config_domain_capabilities_os_init(GVirConfigDomainCapabi= litiesOs *os) +{ + os->priv =3D GVIR_CONFIG_DOMAIN_CAPABILITIES_OS_GET_PRIVATE(os); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.h b/lib= virt-gconfig/libvirt-gconfig-domain-capabilities-os.h new file mode 100644 index 0000000..dba8572 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.h @@ -0,0 +1,61 @@ +/* + * libvirt-gconfig-domain-capabilities-os.h: libvirt domain capabilities OS + * + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_CAPABILITIES_OS_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_CAPABILITIES_OS_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES_OS (gvir_config_do= main_capabilities_os_get_type ()) +#define GVIR_CONFIG_DOMAIN_CAPABILITIES_OS(obj) (G_TYPE_CHECK_I= NSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES_OS, GVirConfigDom= ainCapabilitiesOs)) +#define GVIR_CONFIG_DOMAIN_CAPABILITIES_OS_CLASS(klass) (G_TYPE_CHECK_C= LASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES_OS, GVirConfigDoma= inCapabilitiesOsClass)) +#define GVIR_CONFIG_IS_DOMAIN_CAPABILITIES_OS(obj) (G_TYPE_CHECK_I= NSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES_OS)) +#define GVIR_CONFIG_IS_DOMAIN_CAPABILITIES_OS_CLASS(klass) (G_TYPE_CHECK_C= LASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES_OS)) +#define GVIR_CONFIG_DOMAIN_CAPABILITIES_OS_GET_CLASS(obj) (G_TYPE_INSTANC= E_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES_OS, GVirConfigDoma= inCapabilitiesOsClass)) + +typedef struct _GVirConfigDomainCapabilitiesOs GVirConfigDomainCapabilitie= sOs; +typedef struct _GVirConfigDomainCapabilitiesOsPrivate GVirConfigDomainCapa= bilitiesOsPrivate; +typedef struct _GVirConfigDomainCapabilitiesOsClass GVirConfigDomainCapabi= litiesOsClass; + +struct _GVirConfigDomainCapabilitiesOs +{ + GVirConfigObject parent; + + GVirConfigDomainCapabilitiesOsPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainCapabilitiesOsClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_capabilities_os_get_type(void); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_CAPABILITIES_OS_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gc= onfig.h index 9fde05a..896b4f1 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-= gconfig.sym index 4a13635..0e5c06b 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -777,6 +777,7 @@ global: gvir_config_domain_capabilities_get_type; gvir_config_domain_capabilities_new; gvir_config_domain_capabilities_new_from_xml; + gvir_config_domain_capabilities_os_get_type; gvir_config_domain_os_firmware_get_type; gvir_config_domain_os_set_firmware; gvir_config_storage_vol_target_features_get_type; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515586; cv=none; d=zoho.com; s=zohoarc; b=CKcbPqcsU7ci97ns0mlbJhs8CA4staR1RjUVCPpowq4FiUZ4u6e/cSF2aVP+d7dTPbodm0zQHzJiFaCFhdYy7alCRJkXIPNEgpJVl1mRraKfYYmUubiZfl8BGoDYZzhtr3yYOrihcHjLDel+ZCtepD7v2+2jC3wLVrhDmG/MfAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515586; 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=kvIz0FILZ9hzterLY8QkC97ttvmBRee4WK64lNzI6Ko=; b=cINuhb+vuFYFgwIkpEfWZzb+ns/Dkv3+OPxeTy7JiKCY40kD3h9l7nrIS9iyHaQ6Mf248KWQqmdcsTMCGOW3oSUbPTo59v/zzA9yp30sB35HQT7fsZrIHsY6NVXIItve6rjF8Gd3V3Bk6GVrJ6jSOS5vuGsFT6lVwhPjF4mqXy4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1557515586089485.1121736500771; Fri, 10 May 2019 12:13:06 -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 62FCCC057F2F; Fri, 10 May 2019 19:13:04 +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 357A760C78; Fri, 10 May 2019 19:13:04 +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 DCA0518089CB; Fri, 10 May 2019 19:13:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJD2GW003687 for ; Fri, 10 May 2019 15:13:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DB636015A; Fri, 10 May 2019 19:13:02 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FD2260166; Fri, 10 May 2019 19:13:01 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:42 +0200 Message-Id: <20190510191245.32567-6-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 5/8] gconfig: Add _domain_capabilities_get_os() 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-Type: text/plain; charset="utf-8" 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.32]); Fri, 10 May 2019 19:13:05 +0000 (UTC) Add a way to access the object which represents the element from the . Signed-off-by: Fabiano Fid=C3=AAncio --- .../libvirt-gconfig-domain-capabilities.c | 23 +++++++++++++++++++ .../libvirt-gconfig-domain-capabilities.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 1 + 3 files changed, 25 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities.c b/libvir= t-gconfig/libvirt-gconfig-domain-capabilities.c index 3377889..906e7f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities.c @@ -69,3 +69,26 @@ gvir_config_domain_capabilities_new_from_xml(const gchar= *xml, xml, error); return GVIR_CONFIG_DOMAIN_CAPABILITIES(object); } + +/** + * gvir_config_domain_capabilities_get_os: + * @domain_caps: a #GVirConfigDomainCapabilities + * + * Gets the @os associated with the @domain_caps. + * + * Returns: (transfer full): a new #GVirConfigDomainCapabilitiesOs. + */ +GVirConfigDomainCapabilitiesOs * +gvir_config_domain_capabilities_get_os(GVirConfigDomainCapabilities *domai= n_caps) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_CAPABILITIES(domain_caps), = NULL); + + object =3D gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(domain_caps), + "os", + GVIR_CONFIG_TYPE_DOMAIN_CAPABILITIES_OS); + + return GVIR_CONFIG_DOMAIN_CAPABILITIES_OS(object); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities.h b/libvir= t-gconfig/libvirt-gconfig-domain-capabilities.h index 965d2a4..cbe7540 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-capabilities.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities.h @@ -61,6 +61,7 @@ GType gvir_config_domain_capabilities_get_type(void); GVirConfigDomainCapabilities *gvir_config_domain_capabilities_new(void); GVirConfigDomainCapabilities *gvir_config_domain_capabilities_new_from_xml= (const gchar *xml, = GError **error); +GVirConfigDomainCapabilitiesOs *gvir_config_domain_capabilities_get_os(GVi= rConfigDomainCapabilities *domain_caps); =20 G_END_DECLS =20 diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-= gconfig.sym index 0e5c06b..783b0d7 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -774,6 +774,7 @@ global: =20 LIBVIRT_GCONFIG_2.0.1 { global: + gvir_config_domain_capabilities_get_os; gvir_config_domain_capabilities_get_type; gvir_config_domain_capabilities_new; gvir_config_domain_capabilities_new_from_xml; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515591; cv=none; d=zoho.com; s=zohoarc; b=emXqO8jB28zEfo0y82+SkwoCwe+lg0sgyqIq+QI+zne92K2aJLJlnY7It3WWQoznd/Jj7xhIwblSn4zLoTLzHfU+PwFrAA1NsL/yYfCSXXfrle2HFxHc2ShtAOD2/21GLzLsbOQTMrWbioSCTw2gojkhn4GhMWwXDmJlVDbXR8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515591; 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=PptEs5jhC7WRAAEIn5Fn2ib2aPXvzFXqNwIOSmucZ1Y=; b=gQlPJKe4zQB5OOgW7Z7lTmITFPl/V503MAXaEtpbV9bdfIg/pGzBv/S6AU2xnm/RbK6I0O4xeD0gaU5FvZJEIXuUbMhOoCQkl5Ygpj6QLv66bg4/3Rbekg3RO6Vl0773vOrM8Cz+QjqO6blCEsJQ+eZu0wRTQmqR80Shz7svgEE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 15575155911911007.3199744895253; Fri, 10 May 2019 12:13:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 586883087924; Fri, 10 May 2019 19:13:09 +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 2DE175D71E; Fri, 10 May 2019 19:13:09 +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 D00473FB10; Fri, 10 May 2019 19:13:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJD5F2003711 for ; Fri, 10 May 2019 15:13:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0C9B46013B; Fri, 10 May 2019 19:13:05 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E64160199; Fri, 10 May 2019 19:13:02 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:43 +0200 Message-Id: <20190510191245.32567-7-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 6/8] gconfig: Add _domain_capabilities_os_get_firmwares() 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-Type: text/plain; charset="utf-8" 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 10 May 2019 19:13:09 +0000 (UTC) Add a way to access the element's conent from . Signed-off-by: Fabiano Fid=C3=AAncio --- .../libvirt-gconfig-domain-capabilities-os.c | 74 ++++++++++++++++++- .../libvirt-gconfig-domain-capabilities-os.h | 7 +- libvirt-gconfig/libvirt-gconfig.sym | 1 + 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c b/lib= virt-gconfig/libvirt-gconfig-domain-capabilities-os.c index d3b6e3c..98a1bff 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.c @@ -33,11 +33,83 @@ struct _GVirConfigDomainCapabilitiesOsPrivate =20 G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCapabilitiesOs, gvir_config_dom= ain_capabilities_os, GVIR_CONFIG_TYPE_OBJECT); =20 -static void gvir_config_domain_capabilities_os_class_init(GVirConfigDomain= CapabilitiesOsClass *klass G_GNUC_UNUSED) +static GList * +_gvir_config_domain_capabilities_os_get_firmwares(GVirConfigDomainCapabili= tiesOs *os); + +static void gvir_config_domain_capabilities_os_class_init(GVirConfigDomain= CapabilitiesOsClass *klass) { + klass->get_firmwares =3D _gvir_config_domain_capabilities_os_get_firmw= ares; } =20 static void gvir_config_domain_capabilities_os_init(GVirConfigDomainCapabi= litiesOs *os) { os->priv =3D GVIR_CONFIG_DOMAIN_CAPABILITIES_OS_GET_PRIVATE(os); } + +static gboolean add_firmwares(xmlNodePtr node, gpointer opaque) +{ + GList **firmwares =3D opaque; + GVirConfigDomainOsFirmware firmware; + + if (node =3D=3D NULL || node->children =3D=3D NULL) + return TRUE; + + firmware =3D gvir_config_genum_get_value + (GVIR_CONFIG_TYPE_DOMAIN_OS_FIRMWARE, + (const gchar *)node->children->content, + GVIR_CONFIG_DOMAIN_OS_FIRMWARE_BIOS); + *firmwares =3D g_list_append(*firmwares, GINT_TO_POINTER(firmware)); + + return TRUE; +} + +static gboolean search_firmwares(xmlNodePtr node, gpointer opaque) +{ + const gchar *content; + + if (!g_str_equal(node->name, "enum")) + return TRUE; + + content =3D gvir_config_xml_get_attribute_content(node, "name"); + if (content =3D=3D NULL) + return TRUE; + + if (!g_str_equal(content, "firmware")) + return TRUE; + + gvir_config_xml_foreach_child(node, + add_firmwares, + opaque); + + return TRUE; +} + +static GList * +_gvir_config_domain_capabilities_os_get_firmwares(GVirConfigDomainCapabili= tiesOs *os) +{ + GList *firmwares =3D NULL; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_CAPABILITIES_OS(os), NULL); + + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(os), + NULL, + search_firmwares, + &firmwares); + + return firmwares; +} + +/** + * gvir_config_domain_capabilities_os_get_firmwares: + * + * Gets the firmwares supported by @os. The returned list should be freed = with + * g_list_free(). + * + * Returns: (element-type LibvirtGConfig.DomainOsFirmware) (transfer conta= iner): + * a newly allocated #GList of #GVirConfigDomainOsFirmware. + */ +GList * +gvir_config_domain_capabilities_os_get_firmwares(GVirConfigDomainCapabilit= iesOs *os) +{ + return GVIR_CONFIG_DOMAIN_CAPABILITIES_OS_GET_CLASS(os)->get_firmwares= (os); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.h b/lib= virt-gconfig/libvirt-gconfig-domain-capabilities-os.h index dba8572..ce36be2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-capabilities-os.h @@ -51,11 +51,16 @@ struct _GVirConfigDomainCapabilitiesOsClass { GVirConfigObjectClass parent_class; =20 - gpointer padding[20]; + GList *(*get_firmwares)(GVirConfigDomainCapabilitiesOs *os); + + gpointer padding[19]; }; =20 GType gvir_config_domain_capabilities_os_get_type(void); =20 +GList * +gvir_config_domain_capabilities_os_get_firmwares(GVirConfigDomainCapabilit= iesOs *os); + G_END_DECLS =20 #endif /* __LIBVIRT_GCONFIG_DOMAIN_CAPABILITIES_OS_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-= gconfig.sym index 783b0d7..d40bb7b 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -778,6 +778,7 @@ global: gvir_config_domain_capabilities_get_type; gvir_config_domain_capabilities_new; gvir_config_domain_capabilities_new_from_xml; + gvir_config_domain_capabilities_os_get_firmwares; gvir_config_domain_capabilities_os_get_type; gvir_config_domain_os_firmware_get_type; gvir_config_domain_os_set_firmware; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515591; cv=none; d=zoho.com; s=zohoarc; b=RoxIKFjWq/ZLqsw7ot1ItTFXLk+Wg4MfdEI+NaIVRIr1nNXWnzfRl3KXkDT373muEZSGJLRzt5VjbJJNet3eoMMK8GsFFFYbvVZle97pQznArPoSnaRChjFBBASgPXdZdLIlQgscFoNcyPF7fxMpOp40JW7JqxWpI6UiyfgrOgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515591; 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=QjusSLf+b6LOR34iN9QAbieFeESL2bgEfFtANLHJOrk=; b=bqf3ilxfA7kWLTGXVvetf/unkKnNh3InvvIabXIdbrnk0xW5tGyKcvFDmuex/KMCo0IWltz1bbJxuQdPu/i+0m1PV8Rjfp3tVdGFOjf4dwt1QZrZ/3xZCmvVvhctUsim5qnHWXZDRO0HokRv3keCy6OkHVVTtqv8VdOobh1RN0w= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1557515591726642.0559247156432; Fri, 10 May 2019 12:13:11 -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 B05B981DEB; Fri, 10 May 2019 19:13:09 +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 823EF5C205; Fri, 10 May 2019 19:13:09 +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 2F2DB18089D4; Fri, 10 May 2019 19:13:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJD8Gw003721 for ; Fri, 10 May 2019 15:13:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5CB7E6015A; Fri, 10 May 2019 19:13:08 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF39D60126; Fri, 10 May 2019 19:13:05 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:44 +0200 Message-Id: <20190510191245.32567-8-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 7/8] tests: Add basic test for domain capabilities 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-Type: text/plain; charset="utf-8" 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.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 10 May 2019 19:13:10 +0000 (UTC) This basic test only ensures that we can properly parse: bios efi Signed-off-by: Fabiano Fid=C3=AAncio --- tests/test-gconfig.c | 33 ++++++++++++++++++++ tests/xml/gconfig-domain-capabilities-os.xml | 23 ++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 tests/xml/gconfig-domain-capabilities-os.xml diff --git a/tests/test-gconfig.c b/tests/test-gconfig.c index fda4fcb..6979578 100644 --- a/tests/test-gconfig.c +++ b/tests/test-gconfig.c @@ -791,6 +791,37 @@ static void test_domain_device_unknown(void) g_free(xml); } =20 +static void test_domain_capabilities_os(void) +{ + GVirConfigDomainCapabilities *domain_caps; + GVirConfigDomainCapabilitiesOs *os; + GList *firmwares, *l; + gsize i; + GVirConfigDomainOsFirmware expected_firmwares[] =3D {GVIR_CONFIG_DOMAI= N_OS_FIRMWARE_BIOS, + GVIR_CONFIG_DOMAIN_= OS_FIRMWARE_EFI}; + GError *error =3D NULL; + gchar *xml; + + xml =3D load_xml("gconfig-domain-capabilities-os.xml"); + + domain_caps =3D gvir_config_domain_capabilities_new_from_xml(xml, &er= ror); + g_assert_no_error(error); + + os =3D gvir_config_domain_capabilities_get_os(domain_caps); + g_assert_nonnull(os); + + firmwares =3D gvir_config_domain_capabilities_os_get_firmwares(os); + g_assert_nonnull(firmwares); + + for (l =3D firmwares, i =3D 0; l !=3D NULL; l =3D l->next, i++) + g_assert_cmpint(GPOINTER_TO_INT(l->data), =3D=3D, expected_firmwar= es[i]); + + + g_list_free(firmwares); + g_object_unref(os); + g_object_unref(domain_caps); + g_free(xml); +} =20 int main(int argc, char **argv) { @@ -825,6 +856,8 @@ int main(int argc, char **argv) test_domain_device_pci_hostdev); g_test_add_func("/libvirt-gconfig/domain-device-unknown", test_domain_device_unknown); + g_test_add_func("/libvirt-gconfig/domain-capabilities-os", + test_domain_capabilities_os); =20 return g_test_run(); } diff --git a/tests/xml/gconfig-domain-capabilities-os.xml b/tests/xml/gconf= ig-domain-capabilities-os.xml new file mode 100644 index 0000000..7e813c6 --- /dev/null +++ b/tests/xml/gconfig-domain-capabilities-os.xml @@ -0,0 +1,23 @@ + + + + bios + efi + + + /usr/share/edk2/ovmf/OVMF_CODE.fd + /usr/share/edk2/aarch64/QEMU_EFI-pflash.raw + + rom + pflash + + + yes + no + + + no + + + + --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 00:11:31 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557515597; cv=none; d=zoho.com; s=zohoarc; b=V9LEoezDZeIXKT05PuO6wlkxMNHou31LKoioWZ+3CltURiEqAd8HWhx9b6gliQEh5ydaOFr0nWIiUGlTgOZGHuPAn1PouVtjrsVevDjtLY34ftYICSA66v4ZhXqfvfCpYI+4KzEptAHZBZ0GVQ1C2nrBxWNNLBQ/a7ma9HJ37Y4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557515597; 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=tlgu34V1BmEPhCSI2Fegf1/U8Ec/QU3r5k0cJ3yV6qk=; b=cS4th/sfWuQUHV2K2PujwUMVja9V9N77ot06nzeioMZ/eVZGbhO7/algrTu28HuRKkYkbOShVVSS5iFcwigkkqficL6xx+MKzj3khh4J+D6wZnhuZi0CpktZQZkPlkd/8dMOrCdDG8OGXleETEcTMxWMvQSPOclm2C5/ymi5mzo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass 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 1557515597190548.8539337109314; Fri, 10 May 2019 12:13:17 -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 8A2B53082B02; Fri, 10 May 2019 19:13:15 +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 60CA4608C2; Fri, 10 May 2019 19:13:15 +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 053AA18052E1; Fri, 10 May 2019 19:13:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4AJDDMj003741 for ; Fri, 10 May 2019 15:13:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 62F9B6015A; Fri, 10 May 2019 19:13:13 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8962C60126; Fri, 10 May 2019 19:13:08 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Fri, 10 May 2019 21:12:45 +0200 Message-Id: <20190510191245.32567-9-fidencio@redhat.com> In-Reply-To: <20190510191245.32567-1-fidencio@redhat.com> References: <20190510191245.32567-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH 8/8] gobject: Wrap virConnectGetDomainCapabilities() 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-Type: text/plain; charset="utf-8" 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.45]); Fri, 10 May 2019 19:13:16 +0000 (UTC) In order to do so, 3 new APIs have been added: - gvir_connection_get_domain_capabilities(); - gvir_connection_get_domain_capabilities_async(); - gvir_connection_get_domain_capabilities_finish(); The returned object is a GVirConfigDomainCapabilities, from which consumers will be able to access a few other objects representing the XML returned by virConnectGetDomainCapabilities(). Signed-off-by: Fabiano Fid=C3=AAncio --- libvirt-gobject/libvirt-gobject-connection.c | 168 +++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 22 +++ libvirt-gobject/libvirt-gobject.sym | 8 + 3 files changed, 198 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject= /libvirt-gobject-connection.c index e84ca6d..8e7bf5e 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -2077,6 +2077,174 @@ GVirNodeInfo *gvir_connection_get_node_info(GVirCon= nection *conn, return ret; } =20 +/** + * gvir_connection_get_domain_capabilities: + * @conn: a #GVirConnection + * @emulatorbin: (allow-none): path to emulator + * @arch: (allow-none): domain architecture + * @machine: (allow-none): machine type + * @virttype: (allow-none): virtualization type + * @flags: extra flags; not used yet, so callers should always pass 0 + * @err: return location for any #GError + * + * Return value: (transfer full): a #GVirConfigDomainCapabilities or NULL. + * The return object should be unreffed with g_object_unref() when no long= er + * needed. + */ +GVirConfigDomainCapabilities * +gvir_connection_get_domain_capabilities(GVirConnection *conn, + const gchar *emulatorbin, + const gchar *arch, + const gchar *machine, + const gchar *virttype, + guint flags, + GError **err) +{ + GVirConfigDomainCapabilities *domain_caps; + gchar *domain_caps_xml; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(err =3D=3D NULL || *err =3D=3D NULL, NULL); + g_return_val_if_fail(conn->priv->conn, NULL); + + domain_caps_xml =3D virConnectGetDomainCapabilities(conn->priv->conn, + emulatorbin, + arch, + machine, + virttype, + flags); + if (domain_caps_xml =3D=3D NULL) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + _("Unable to get domain capabilities")); + return NULL; + } + + domain_caps =3D gvir_config_domain_capabilities_new_from_xml(domain_ca= ps_xml, err); + free(domain_caps_xml); + + return domain_caps; +} + +typedef struct { + gchar *emulatorbin; + gchar *arch; + gchar *machine; + gchar *virttype; + guint flags; +} GetDomainCapabilitiesData; + +static void get_domain_capabilities_data_free(GetDomainCapabilitiesData *d= ata) +{ + g_free(data->emulatorbin); + g_free(data->arch); + g_free(data->machine); + g_free(data->virttype); + g_slice_free(GetDomainCapabilitiesData, data); +} + +static void +gvir_connection_get_domain_capabilities_helper(GTask *task, + gpointer object, + gpointer task_data G_GNUC_U= NUSED, + GCancellable *cancellable G= _GNUC_UNUSED) +{ + GVirConnection *conn =3D GVIR_CONNECTION(object); + GetDomainCapabilitiesData *data; + GError *err =3D NULL; + GVirConfigDomainCapabilities *domain_caps; + + data =3D (GetDomainCapabilitiesData *)task_data; + + domain_caps =3D gvir_connection_get_domain_capabilities(conn, + data->emulatorbi= n, + data->arch, + data->machine, + data->virttype, + data->flags, + &err); + if (domain_caps =3D=3D NULL) { + g_task_return_error(task, err); + + return; + } + + g_task_return_pointer(task, domain_caps, g_object_unref); +} + +/** + * gvir_connection_get_domain_capabilities_async: + * @conn: a #GVirConnection + * @emulatorbin: (allow-none): path to emulator + * @arch: (allow-none): domain architecture + * @machine: (allow-none): machine type + * @virttype: (allow-none): virtualization type + * @flags: extra flags; not used yet, so callers should always pass 0 + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + */ +void gvir_connection_get_domain_capabilities_async(GVirConnection *conn, + const gchar *emulatorbi= n, + const gchar *arch, + const gchar *machine, + const gchar *virttype, + guint flags, + GCancellable *cancellab= le, + GAsyncReadyCallback cal= lback, + gpointer user_data) +{ + GTask *task; + GetDomainCapabilitiesData *data; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail((cancellable =3D=3D NULL) || G_IS_CANCELLABLE(cancell= able)); + + data =3D g_slice_new0(GetDomainCapabilitiesData); + data->emulatorbin =3D g_strdup(emulatorbin); + data->arch =3D g_strdup(arch); + data->machine =3D g_strdup(machine); + data->virttype =3D g_strdup(virttype); + data->flags =3D flags; + + task =3D g_task_new(G_OBJECT(conn), + cancellable, + callback, + user_data); + g_task_set_source_tag(task, + gvir_connection_get_domain_capabilities_async); + g_task_set_task_data(task, + data, + (GDestroyNotify)get_domain_capabilities_data_free= ); + g_task_run_in_thread(task, + gvir_connection_get_domain_capabilities_helper); + g_object_unref(task); +} + +/** + * gvir_connection_get_domain_capabilities_finish: + * @conn: a #GVirConnection + * @result: (transfer none): async method result + * + * Return value: (transfer full): a #GVirConfigDomainCapabilities or NULL. + * The returned object should be unreffed with g_object_unref() when no + * longer needed. + */ +GVirConfigDomainCapabilities * +gvir_connection_get_domain_capabilities_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(g_task_is_valid(result, G_OBJECT(conn)), + NULL); + g_return_val_if_fail(g_task_get_source_tag(G_TASK(result)) =3D=3D + gvir_connection_get_domain_capabilities_async, + NULL); + + return g_task_propagate_pointer(G_TASK(result), err); +} + /** * gvir_connection_get_capabilities: * @conn: a #GVirConnection diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject= /libvirt-gobject-connection.h index f3d2cb8..9557fde 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -255,6 +255,28 @@ gboolean gvir_connection_restore_domain_from_file_finish(GVirConnection *conn, GAsyncResult *result, GError **err); + +GVirConfigDomainCapabilities *gvir_connection_get_domain_capabilities(GVir= Connection *conn, + cons= t gchar *emulatorbin, + cons= t gchar *arch, + cons= t gchar *machine, + cons= t gchar *virttype, + guin= t flags, + GErr= or **err); +void gvir_connection_get_domain_capabilities_async(GVirConnection *conn, + const gchar *emulatorbi= n, + const gchar *arch, + const gchar *machine, + const gchar *virttype, + guint flags, + GCancellable *cancellab= le, + GAsyncReadyCallback cal= lback, + gpointer user_data); +GVirConfigDomainCapabilities * +gvir_connection_get_domain_capabilities_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); + G_END_DECLS =20 #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-= gobject.sym index fe5bffe..b663906 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -311,4 +311,12 @@ LIBVIRT_GOBJECT_0.2.3 { gvir_domain_set_time_finish; } LIBVIRT_GOBJECT_0.2.2; =20 + +LIBVIRT_GOBJECT_2.0.1 { + global: + gvir_connection_get_domain_capabilities; + gvir_connection_get_domain_capabilities_async; + gvir_connection_get_domain_capabilities_finish; +} LIBVIRT_GOBJECT_0.2.3; + # .... define new API here using predicted next version number .... --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list