From nobody Thu May 2 17:12:07 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554482058599918.1096682081769; Fri, 5 Apr 2019 09:34:18 -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 F241FC05001A; Fri, 5 Apr 2019 16:34: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 CC74B60C8D; Fri, 5 Apr 2019 16:34: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 8B7733FA46; Fri, 5 Apr 2019 16:34:16 +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 x35GY5st008691 for ; Fri, 5 Apr 2019 12:34:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5221D17258; Fri, 5 Apr 2019 16:34:05 +0000 (UTC) Received: from thyrus.usersys.redhat.com (unknown [10.43.2.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A83AF173D9; Fri, 5 Apr 2019 16:34:03 +0000 (UTC) From: Pino Toscano To: libvir-list@redhat.com Date: Fri, 5 Apr 2019 18:33:53 +0200 Message-Id: <20190405163355.20522-2-ptoscano@redhat.com> In-Reply-To: <20190405163355.20522-1-ptoscano@redhat.com> References: <20190405163355.20522-1-ptoscano@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [ocaml PATCH 1/3] build: bump required libvirt to 1.2.8 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.31]); Fri, 05 Apr 2019 16:34:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" virConnectGetAllDomainStats, used unconditionally, was introduced in libvirt 1.2.8. Signed-off-by: Pino Toscano --- configure.ac | 2 +- libvirt/libvirt.mli | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7d923bf..a463dba 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ fi =20 dnl Check for libvirt development environment. PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES([LIBVIRT], [libvirt >=3D 1.0.2]) +PKG_CHECK_MODULES([LIBVIRT], [libvirt >=3D 1.2.8]) =20 dnl Check for basic OCaml environment & findlib. AC_PROG_OCAML diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli index 628f797..0bd3d05 100644 --- a/libvirt/libvirt.mli +++ b/libvirt/libvirt.mli @@ -145,7 +145,7 @@ printf "uri =3D %s\n%!" uri =20 {3 Backwards and forwards compatibility} =20 - OCaml-libvirt requires libvirt version 1.0.2 or later. Future + OCaml-libvirt requires libvirt version 1.2.8 or later. Future releases of OCaml-libvirt will use newer features of libvirt and therefore will require later versions of libvirt. It is always possible to dynamically link your application against a newer --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 17:12:07 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554482062853921.0566855367497; Fri, 5 Apr 2019 09:34:22 -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 9EAF4307D84B; Fri, 5 Apr 2019 16:34:20 +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 74D6D26547; Fri, 5 Apr 2019 16:34:20 +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 210BF3FA4A; Fri, 5 Apr 2019 16:34:20 +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 x35GY6gt008701 for ; Fri, 5 Apr 2019 12:34:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C921173D9; Fri, 5 Apr 2019 16:34:06 +0000 (UTC) Received: from thyrus.usersys.redhat.com (unknown [10.43.2.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A0D455F9A6; Fri, 5 Apr 2019 16:34:05 +0000 (UTC) From: Pino Toscano To: libvir-list@redhat.com Date: Fri, 5 Apr 2019 18:33:54 +0200 Message-Id: <20190405163355.20522-3-ptoscano@redhat.com> In-Reply-To: <20190405163355.20522-1-ptoscano@redhat.com> References: <20190405163355.20522-1-ptoscano@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [ocaml PATCH 2/3] Implement Connect.get_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-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.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 05 Apr 2019 16:34:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Wrap the virConnectGetDomainCapabilities C API. Signed-off-by: Pino Toscano --- libvirt/libvirt.ml | 2 ++ libvirt/libvirt.mli | 16 ++++++++++++++++ libvirt/libvirt_c_oneoffs.c | 16 ++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml index 49ccc3e..c7c5ffc 100644 --- a/libvirt/libvirt.ml +++ b/libvirt/libvirt.ml @@ -138,6 +138,8 @@ struct cb =3D _call_auth_default_callback; } =20 + external get_domain_capabilities : ?emulatorbin:string -> ?arch:string -= > ?machine:string -> ?virttype:string -> [>`R] t -> string =3D "ocaml_libvi= rt_connect_get_domain_capabilities" + external const : [>`R] t -> ro t =3D "%identity" end =20 diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli index 0bd3d05..7448722 100644 --- a/libvirt/libvirt.mli +++ b/libvirt/libvirt.mli @@ -456,6 +456,22 @@ sig of libvirt. *) =20 + val get_domain_capabilities : ?emulatorbin:string -> ?arch:string -> ?ma= chine:string -> ?virttype:string -> [>`R] t -> string + (** [get_domain_capabilities ()] returns the XML with the + available capabilities of the emulator or libvirt for domains. + + The optional flag [?emulatorbin] is used to specify a different + emulator. + + The optional flag [?arch] is used to specify a different + architecture. + + The optional flag [?machine] is used to specify a different + machine type. + + The optional flag [?virttype] is used to specify a different + type of virtualization. *) + external const : [>`R] t -> ro t =3D "%identity" (** [const conn] turns a read/write connection into a read-only connection. Note that the opposite operation is impossible. diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c index 71ca78e..0a9e485 100644 --- a/libvirt/libvirt_c_oneoffs.c +++ b/libvirt/libvirt_c_oneoffs.c @@ -419,6 +419,22 @@ ocaml_libvirt_connect_call_auth_default_callback (valu= e listv) CAMLreturn (retv); } =20 +CAMLprim value +ocaml_libvirt_connect_get_domain_capabilities (value emulatorbinv, value a= rchv, value machinev, value virttypev, value connv) +{ + CAMLparam5 (emulatorbinv, archv, machinev, virttypev, connv); + CAMLlocal1 (rv); + virConnectPtr conn =3D Connect_val (connv); + char *r; + + NONBLOCKING (r =3D virConnectGetDomainCapabilities (conn, Optstring_val = (emulatorbinv), Optstring_val (archv), Optstring_val (machinev), Optstring_= val (virttypev), 0)); + CHECK_ERROR (r =3D=3D NULL, "virConnectGetDomainCapabilities"); + + rv =3D caml_copy_string (r); + free (r); + CAMLreturn (rv); +} + CAMLprim value ocaml_libvirt_domain_get_id (value domv) { --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 17:12:07 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155448205179039.165483648872055; Fri, 5 Apr 2019 09:34:11 -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 D7A903002607; Fri, 5 Apr 2019 16:34: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 8F21D60D5E; Fri, 5 Apr 2019 16:34: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 B9FEF181AC45; Fri, 5 Apr 2019 16:34:08 +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 x35GY72t008707 for ; Fri, 5 Apr 2019 12:34:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4575D5F9A6; Fri, 5 Apr 2019 16:34:07 +0000 (UTC) Received: from thyrus.usersys.redhat.com (unknown [10.43.2.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B36E5C1B4; Fri, 5 Apr 2019 16:34:06 +0000 (UTC) From: Pino Toscano To: libvir-list@redhat.com Date: Fri, 5 Apr 2019 18:33:55 +0200 Message-Id: <20190405163355.20522-4-ptoscano@redhat.com> In-Reply-To: <20190405163355.20522-1-ptoscano@redhat.com> References: <20190405163355.20522-1-ptoscano@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [ocaml PATCH 3/3] Synchronize Virterror with libvirt 5.2.0 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.40]); Fri, 05 Apr 2019 16:34:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pino Toscano --- libvirt/libvirt.ml | 10 ++++++++++ libvirt/libvirt.mli | 5 +++++ libvirt/libvirt_c_epilogue.c | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml index c7c5ffc..d935bfc 100644 --- a/libvirt/libvirt.ml +++ b/libvirt/libvirt.ml @@ -248,6 +248,9 @@ struct | VIR_ERR_DEVICE_MISSING | VIR_ERR_INVALID_NWFILTER_BINDING | VIR_ERR_NO_NWFILTER_BINDING + | VIR_ERR_INVALID_DOMAIN_CHECKPOINT + | VIR_ERR_NO_DOMAIN_CHECKPOINT + | VIR_ERR_NO_DOMAIN_BACKUP | VIR_ERR_UNKNOWN of int =20 let string_of_code =3D function @@ -353,6 +356,9 @@ struct | VIR_ERR_DEVICE_MISSING -> "VIR_ERR_DEVICE_MISSING" | VIR_ERR_INVALID_NWFILTER_BINDING -> "VIR_ERR_INVALID_NWFILTER_BINDIN= G" | VIR_ERR_NO_NWFILTER_BINDING -> "VIR_ERR_NO_NWFILTER_BINDING" + | VIR_ERR_INVALID_DOMAIN_CHECKPOINT -> "VIR_ERR_INVALID_DOMAIN_CHECKPO= INT" + | VIR_ERR_NO_DOMAIN_CHECKPOINT -> "VIR_ERR_NO_DOMAIN_CHECKPOINT" + | VIR_ERR_NO_DOMAIN_BACKUP -> "VIR_ERR_NO_DOMAIN_BACKUP" | VIR_ERR_UNKNOWN i -> "VIR_ERR_" ^ string_of_int i =20 type domain =3D @@ -424,6 +430,8 @@ struct | VIR_FROM_PERF | VIR_FROM_LIBSSH | VIR_FROM_RESCTRL + | VIR_FROM_FIREWALLD + | VIR_FROM_DOMAIN_CHECKPOINT | VIR_FROM_UNKNOWN of int =20 let string_of_domain =3D function @@ -495,6 +503,8 @@ struct | VIR_FROM_PERF -> "VIR_FROM_PERF" | VIR_FROM_LIBSSH -> "VIR_FROM_LIBSSH" | VIR_FROM_RESCTRL -> "VIR_FROM_RESCTRL" + | VIR_FROM_FIREWALLD -> "VIR_FROM_FIREWALLD" + | VIR_FROM_DOMAIN_CHECKPOINT -> "VIR_FROM_DOMAIN_CHECKPOINT" | VIR_FROM_UNKNOWN i -> "VIR_FROM_" ^ string_of_int i =20 type level =3D diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli index 7448722..fc5a1fc 100644 --- a/libvirt/libvirt.mli +++ b/libvirt/libvirt.mli @@ -1478,6 +1478,9 @@ sig | VIR_ERR_DEVICE_MISSING | VIR_ERR_INVALID_NWFILTER_BINDING | VIR_ERR_NO_NWFILTER_BINDING + | VIR_ERR_INVALID_DOMAIN_CHECKPOINT + | VIR_ERR_NO_DOMAIN_CHECKPOINT + | VIR_ERR_NO_DOMAIN_BACKUP (* ^^ NB: If you add a variant you MUST edit libvirt_c_epilogue.c:MAX_VIR_* *) | VIR_ERR_UNKNOWN of int (** Other error, not handled with existing va= lues. *) @@ -1554,6 +1557,8 @@ sig | VIR_FROM_PERF | VIR_FROM_LIBSSH | VIR_FROM_RESCTRL + | VIR_FROM_FIREWALLD + | VIR_FROM_DOMAIN_CHECKPOINT (* ^^ NB: If you add a variant you MUST edit libvirt_c_epilogue.c: MAX_VIR_* *) | VIR_FROM_UNKNOWN of int (** Other domain, not handled with existing = values. *) diff --git a/libvirt/libvirt_c_epilogue.c b/libvirt/libvirt_c_epilogue.c index 4e75d2f..4d45629 100644 --- a/libvirt/libvirt_c_epilogue.c +++ b/libvirt/libvirt_c_epilogue.c @@ -143,8 +143,8 @@ Val_virconnectcredential (const virConnectCredentialPtr= cred) * to convert it into VIR_*_UNKNOWN (code). */ =20 -#define MAX_VIR_CODE 101 /* VIR_ERR_NO_NWFILTER_BINDING */ -#define MAX_VIR_DOMAIN 67 /* VIR_FROM_RESCTRL */ +#define MAX_VIR_CODE 104 /* VIR_ERR_NO_DOMAIN_BACKUP */ +#define MAX_VIR_DOMAIN 69 /* VIR_FROM_DOMAIN_CHECKPOINT */ #define MAX_VIR_LEVEL VIR_ERR_ERROR =20 static inline value --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list