mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib: Remove configure-time QEMU

Browse Source 
Remove the configure-time QEMU definition.  No longer initialize g->hv
= QEMU.  g->hv may now be NULL if the user does not explicitly either
call guestfs_set_hv or set LIBGUESTFS_HV.

Remove any assumptions in the code that g->hv is always non-NULL.

Fix one test that relied on the QEMU definition.
This commit is contained in:
Richard W.M. Jones
2026-03-17 14:52:43 +00:00
committed by rwmjones
parent 39d4437e29
commit 77e447a516
2 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/handle.c
View File

@@ -118,17 +118,6 @@ guestfs_create_flags (unsigned flags, ...)
g->path = strdup (GUESTFS_DEFAULT_PATH); g->path = strdup (GUESTFS_DEFAULT_PATH);
if (!g->path) goto error; if (!g->path) goto error;
#ifdef QEMU
g->hv = strdup (QEMU);
#else
/* configure --without-qemu, so set QEMU to something which will
* definitely fail. The user is expected to override the hypervisor
* by setting an environment variable or calling set_hv.
*/
g->hv = strdup ("false");
#endif
if (!g->hv) goto error;
/* Get program name. */ /* Get program name. */
if (STRPREFIX (getprogname (), "lt-")) if (STRPREFIX (getprogname (), "lt-"))
/* Remove libtool (lt-*) prefix from short name. */ /* Remove libtool (lt-*) prefix from short name. */
@@ -535,27 +524,17 @@ guestfs_impl_get_path (guestfs_h *g)
int int
guestfs_impl_set_qemu (guestfs_h *g, const char *qemu) guestfs_impl_set_qemu (guestfs_h *g, const char *qemu)
{ {
char *new_hv; /* This deprecated API let you set qemu == NULL to mean "use the
* default qemu". set_hv doesn't allow this, although maybe it
/* Only this deprecated set_qemu API supports using NULL as a * should.
* parameter, to mean set it back to the default QEMU. The new
* set_hv API does not allow callers to do this.
*/ */
if (qemu == NULL) { if (qemu == NULL) {
#ifdef QEMU
new_hv = safe_strdup (g, QEMU);
#else
error (g, _("configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is an error"));
return -1;
#endif
}
else
new_hv = safe_strdup (g, qemu);
free (g->hv); free (g->hv);
g->hv = new_hv; g->hv = NULL;
return 0; return 0;
}
return guestfs_impl_set_hv (g, qemu);
} }
const char * const char *

2
tests/regressions/rhbz501893.c
View File

@@ -50,9 +50,7 @@ main (int argc, char *argv[])
assert (guestfs_set_path (g, NULL) == 0); assert (guestfs_set_path (g, NULL) == 0);
assert (guestfs_set_append (g, NULL) == 0); assert (guestfs_set_append (g, NULL) == 0);
#ifdef QEMU
assert (guestfs_set_qemu (g, NULL) == 0); assert (guestfs_set_qemu (g, NULL) == 0);
#endif
guestfs_close (g); guestfs_close (g);
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);