[PATCH libnbd] lib: Add nbd_get_subprocess_pid to return h->pid
by Richard W.M. Jones
Eric:
I'm not totally committed to this patch. It's very simple and it
seems like it might be useful from time to time. But if you think it
could have unexpected consequences or be abused in some way then we
could not take it.
Rich.
2 months, 3 weeks
[PATCH nbdkit] vddk: Detect possible VDDK crash and warn
by Richard W.M. Jones
This is a "meta-workaround" for the VDDK bug described in RHEL-54377
just telling the user where to look for actual workarounds.
Matthew, does this only happen when the snapshot parameter is present?
I'm not sure if we tested the non-snapshot case and if that crashes too.
If so we'd need to remove 'snapshot_moref' from the conditional.
Rich.
3 months, 1 week
[PATCH v4] ocaml: INSTALL_OCAMLLIB Makefile parameter
by Antonio Caggiano
Add INSTALL_OCAMLLIB parameter for allowing ocaml install to a user
defined path. If not defined, fallback to `ocamlc -where`.
Signed-off-by: Antonio Caggiano <quic_acaggian(a)quicinc.com>
---
v4: Add AC_SUBST[INSTALL_OCAMLLIB]
m4/guestfs-ocaml.m4 | 5 +++++
ocaml/Makefile.am | 14 +++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index 25b06408c..bc613ac37 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -210,3 +210,8 @@ OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6"
AC_SUBST([OCAML_WARN_ERROR])
OCAML_FLAGS="-g -annot $safe_string_option"
AC_SUBST([OCAML_FLAGS])
+
+if test "x$INSTALL_OCAMLLIB" = "x"; then
+ INSTALL_OCAMLLIB=$OCAMLLIB
+fi
+AC_SUBST([INSTALL_OCAMLLIB])
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 63713ee68..f7621a8fa 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -185,16 +185,16 @@ data_hook_files += *.cmx *.cmxa
endif
install-data-hook:
- mkdir -p $(DESTDIR)$(OCAMLLIB)
- mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
- rm -rf $(DESTDIR)$(OCAMLLIB)/guestfs
- rm -rf $(DESTDIR)$(OCAMLLIB)/stublibs/dllmlguestfs.so*
+ mkdir -p $(DESTDIR)$(INSTALL_OCAMLLIB)
+ mkdir -p $(DESTDIR)$(INSTALL_OCAMLLIB)/stublibs
+ rm -rf $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs
+ rm -rf $(DESTDIR)$(INSTALL_OCAMLLIB)/stublibs/dllmlguestfs.so*
$(OCAMLFIND) install \
- -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
+ -ldconf ignore -destdir $(DESTDIR)$(INSTALL_OCAMLLIB) \
guestfs \
$(data_hook_files)
- rm -f $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.*
- rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a
+ rm -f $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs/bindtests.*
+ rm $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs/libguestfsocaml.a
CLEANFILES += $(noinst_DATA) $(check_DATA)
--
2.45.1
3 months, 1 week
[PATCH v3] ocaml: INSTALL_OCAMLLIB Makefile parameter
by Antonio Caggiano
Add INSTALL_OCAMLLIB parameter for allowing ocaml install to a user
defined path. If not defined, fallback to `ocamlc -where`.
Signed-off-by: Antonio Caggiano <quic_acaggian(a)quicinc.com>
---
m4/guestfs-ocaml.m4 | 4 ++++
ocaml/Makefile.am | 14 +++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index 25b06408c..6696db5bb 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -210,3 +210,7 @@ OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6"
AC_SUBST([OCAML_WARN_ERROR])
OCAML_FLAGS="-g -annot $safe_string_option"
AC_SUBST([OCAML_FLAGS])
+
+if test "x$INSTALL_OCAMLLIB" = "x"; then
+ INSTALL_OCAMLLIB=$OCAMLLIB
+fi
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 63713ee68..f7621a8fa 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -185,16 +185,16 @@ data_hook_files += *.cmx *.cmxa
endif
install-data-hook:
- mkdir -p $(DESTDIR)$(OCAMLLIB)
- mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
- rm -rf $(DESTDIR)$(OCAMLLIB)/guestfs
- rm -rf $(DESTDIR)$(OCAMLLIB)/stublibs/dllmlguestfs.so*
+ mkdir -p $(DESTDIR)$(INSTALL_OCAMLLIB)
+ mkdir -p $(DESTDIR)$(INSTALL_OCAMLLIB)/stublibs
+ rm -rf $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs
+ rm -rf $(DESTDIR)$(INSTALL_OCAMLLIB)/stublibs/dllmlguestfs.so*
$(OCAMLFIND) install \
- -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
+ -ldconf ignore -destdir $(DESTDIR)$(INSTALL_OCAMLLIB) \
guestfs \
$(data_hook_files)
- rm -f $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.*
- rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a
+ rm -f $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs/bindtests.*
+ rm $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs/libguestfsocaml.a
CLEANFILES += $(noinst_DATA) $(check_DATA)
--
2.45.1
3 months, 1 week
[PATCH v2] ocaml: INSTALL_OCAMLLIB Makefile parameter
by Antonio Caggiano
Add INSTALL_OCAMLLIB parameter for allowing ocaml install to a user
defined path. If not defined, fallback to `ocamlc -where`.
Signed-off-by: Antonio Caggiano <quic_acaggian(a)quicinc.com>
---
ocaml/Makefile.am | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 63713ee68..9e94ad446 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -185,16 +185,19 @@ data_hook_files += *.cmx *.cmxa
endif
install-data-hook:
- mkdir -p $(DESTDIR)$(OCAMLLIB)
- mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
- rm -rf $(DESTDIR)$(OCAMLLIB)/guestfs
- rm -rf $(DESTDIR)$(OCAMLLIB)/stublibs/dllmlguestfs.so*
+ if test "x$INSTALL_OCAMLLIB" = "x"; then
+ INSTALL_OCAMLLIB=$OCAMLLIB
+ fi
+ mkdir -p $(DESTDIR)$(INSTALL_OCAMLLIB)
+ mkdir -p $(DESTDIR)$(INSTALL_OCAMLLIB)/stublibs
+ rm -rf $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs
+ rm -rf $(DESTDIR)$(INSTALL_OCAMLLIB)/stublibs/dllmlguestfs.so*
$(OCAMLFIND) install \
- -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
+ -ldconf ignore -destdir $(DESTDIR)$(INSTALL_OCAMLLIB) \
guestfs \
$(data_hook_files)
- rm -f $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.*
- rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a
+ rm -f $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs/bindtests.*
+ rm $(DESTDIR)$(INSTALL_OCAMLLIB)/guestfs/libguestfsocaml.a
CLEANFILES += $(noinst_DATA) $(check_DATA)
--
2.45.1
3 months, 1 week
[PATCH v2] configure: Use -map in script flags on darwin.
by Antonio Caggiano
-M is not a valid flag for MacOS ld.
Signed-off-by: Antonio Caggiano <quic_acaggian(a)quicinc.com>
---
m4/guestfs-c.m4 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4
index c6d33183d..44c64b6d6 100644
--- a/m4/guestfs-c.m4
+++ b/m4/guestfs-c.m4
@@ -55,9 +55,12 @@ AC_SUBST([WERROR_CFLAGS])
CFLAGS="$CFLAGS -fno-strict-overflow -Wno-strict-overflow"
dnl Work out how to specify the linker script to the linker.
+AS_CASE([$host_os],
+ [darwin*], [MAP_SCRIPT_FLAGS="-Wl,-map"],
+ [MAP_SCRIPT_FLAGS="-Wl,-M"])
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+ VERSION_SCRIPT_FLAGS="$MAP_SCRIPT_FLAGS -Wl,"
AC_SUBST(VERSION_SCRIPT_FLAGS)
dnl Use -fvisibility=hidden by default in the library.
--
2.45.1
3 months, 1 week
[PATCH v1 0/5] Support MacOS
by Antonio Caggiano
Hi,
I love libguestfs and guestfs-tools. Here's a bunch of fixes to make it compile on MacOS.
There's a homebrew formula which applies these patches before building libguests:
https://github.com/quic/homebrew-quic/blob/main/Formula/libguestfs.rb
I am not sure about `configure: Use -map in script flags`, as it probably needs some way
to detect the current platform and use the right flag for the linker.
Best regards,
Antonio Caggiano
Antonio Caggiano (5):
build: Link libvirt-is-version with libgnu
lib: Fix environ on MacOS
configure: Use -map in script flags
qemu: Add HVF to the accelerators list.
ocaml: INSTALL_OCAMLLIB Makefile parameter
lib/Makefile.am | 6 ++++--
lib/guestfs-internal.h | 5 +++++
lib/handle.c | 1 +
lib/qemu.c | 4 ++--
m4/guestfs-c.m4 | 2 +-
m4/ocaml.m4 | 3 +++
ocaml/Makefile.am | 14 +++++++-------
7 files changed, 23 insertions(+), 12 deletions(-)
--
2.45.1
3 months, 1 week
virt-{X} command support Ceph RBD keyring authentication
by brownie4597＠gmail.com
First, i'm appreciate to your hard work.
i have a question for using virt-{X} commands (virt-customize, virt-cat and so on...).
Is there any way to connect RBD storage including keyring for using virt-X commands?
it seems possible with `guestfish add`, but i could not find out with -a option.
https://libguestfs.org/guestfish.1.html#adding-remote-storage
(ex. -a rbd://example.com[:port]/pool/disk)
i tried hard, but switching virt-X commands to `guestfish` is so difficult.
- like `virt-customize`
> virt-customize --hostname -> guestfish add pool/image protocol:rbd username:admin server:example.com:1234 secret:{keyring} : run : mount ~~~ : write /etc/hostname ~~~)
If there is a way, I would appreciate it if you could let me know.
Thanks
3 months, 1 week
