mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c99d727dba | ||
|
|
afb648e7cd | ||
|
|
499e4daf72 | ||
|
|
880ccfe824 | ||
|
|
c4eb878d52 |
@@ -20,8 +20,8 @@
|
||||
# freeform string.
|
||||
m4_define([libguestfs_major], [1])
|
||||
m4_define([libguestfs_minor], [58])
|
||||
m4_define([libguestfs_release], [0])
|
||||
m4_define([release_date], [2026-01-05])
|
||||
m4_define([libguestfs_release], [1])
|
||||
m4_define([release_date], [2026-01-19])
|
||||
|
||||
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
|
||||
AC_SUBST([RELEASE_DATE],release_date)
|
||||
|
||||
@@ -94,5 +94,6 @@ do_getcon (void)
|
||||
#else /* !HAVE_LIBSELINUX */
|
||||
|
||||
OPTGROUP_SELINUX_NOT_AVAILABLE
|
||||
OPTGROUP_SELINUXRELABEL_NOT_AVAILABLE
|
||||
|
||||
#endif /* !HAVE_LIBSELINUX */
|
||||
|
||||
23
lib/qemu.c
23
lib/qemu.c
@@ -67,6 +67,7 @@ generic_qmp_test (guestfs_h *g, const char *qmp_command, char **outp)
|
||||
CLEANUP_FREE char *line = NULL;
|
||||
size_t allocsize = 0;
|
||||
ssize_t len;
|
||||
unsigned lineno;
|
||||
|
||||
guestfs_int_cmd_add_string_unquoted (cmd, "echo ");
|
||||
/* QMP is modal. You have to send the qmp_capabilities command first. */
|
||||
@@ -88,6 +89,7 @@ generic_qmp_test (guestfs_h *g, const char *qmp_command, char **outp)
|
||||
#endif
|
||||
"accel=kvm:hvf:tcg");
|
||||
guestfs_int_cmd_add_string_unquoted (cmd, " -qmp stdio");
|
||||
guestfs_int_cmd_add_string_unquoted (cmd, " -S");
|
||||
guestfs_int_cmd_clear_capture_errors (cmd);
|
||||
|
||||
fd = guestfs_int_cmd_pipe_run (cmd, "r");
|
||||
@@ -106,19 +108,30 @@ generic_qmp_test (guestfs_h *g, const char *qmp_command, char **outp)
|
||||
perrorf (g, "fdopen");
|
||||
return -1;
|
||||
}
|
||||
len = getline (&line, &allocsize, fp); /* line 1 */
|
||||
|
||||
lineno = 1; /* line 1 */
|
||||
len = getline (&line, &allocsize, fp);
|
||||
if (len >= 0) debug (g, "generic_qmp_test: %u: %s", lineno, line);
|
||||
if (len == -1 || strstr (line, "\"QMP\"") == NULL) {
|
||||
parse_failure:
|
||||
debug (g, "did not understand QMP monitor output from %s", g->hv);
|
||||
error (g, "did not understand QMP monitor output from %s", g->hv);
|
||||
return -1;
|
||||
}
|
||||
len = getline (&line, &allocsize, fp); /* line 2 */
|
||||
|
||||
lineno++; /* line 2 */
|
||||
len = getline (&line, &allocsize, fp);
|
||||
if (len >= 0) debug (g, "generic_qmp_test: %u: %s", lineno, line);
|
||||
if (len == -1 || strstr (line, "\"return\"") == NULL)
|
||||
goto parse_failure;
|
||||
len = getline (&line, &allocsize, fp); /* line 3 */
|
||||
|
||||
lineno++; /* line 3 */
|
||||
len = getline (&line, &allocsize, fp);
|
||||
if (len >= 0) debug (g, "generic_qmp_test: %u: %s", lineno, line);
|
||||
if (len == -1 || strstr (line, "\"return\"") == NULL)
|
||||
goto parse_failure;
|
||||
|
||||
*outp = safe_strdup (g, line);
|
||||
|
||||
/* The other lines we don't care about, so finish parsing here. */
|
||||
ignore_value (getline (&line, &allocsize, fp)); /* line 4 */
|
||||
ignore_value (getline (&line, &allocsize, fp)); /* line 5 */
|
||||
@@ -126,7 +139,7 @@ generic_qmp_test (guestfs_h *g, const char *qmp_command, char **outp)
|
||||
r = guestfs_int_cmd_pipe_wait (cmd);
|
||||
/* QMP tests are optional, don't fail if the tests fail. */
|
||||
if (r == -1 || !WIFEXITED (r) || WEXITSTATUS (r) != 0) {
|
||||
debug (g, "%s wait failed or unexpected exit status", g->hv);
|
||||
error (g, "%s wait failed or unexpected exit status", g->hv);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: libguestfs 1.58.0\n"
|
||||
"Project-Id-Version: libguestfs 1.58.1\n"
|
||||
"Report-Msgid-Bugs-To: guestfs@lists.libguestfs.org\n"
|
||||
"POT-Creation-Date: 2026-01-05 16:18+0000\n"
|
||||
"POT-Creation-Date: 2026-01-19 19:41+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: libguestfs 1.58.0\n"
|
||||
"Project-Id-Version: libguestfs 1.58.1\n"
|
||||
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
|
||||
"component=libguestfs&product=Virtualization+Tools\n"
|
||||
"POT-Creation-Date: 2026-01-05 16:18+0000\n"
|
||||
"POT-Creation-Date: 2026-01-19 19:41+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -4009,7 +4009,7 @@ msgstr ""
|
||||
msgid "unable to parse domain capabilities XML returned by libvirt"
|
||||
msgstr ""
|
||||
|
||||
#: lib/launch-libvirt.c:1461 lib/launch-libvirt.c:1709 lib/qemu.c:282
|
||||
#: lib/launch-libvirt.c:1461 lib/launch-libvirt.c:1709 lib/qemu.c:295
|
||||
#, c-format
|
||||
msgid "realpath: could not convert ‘%s’ to absolute path"
|
||||
msgstr ""
|
||||
@@ -4261,25 +4261,25 @@ msgstr ""
|
||||
msgid "file receive cancelled by daemon"
|
||||
msgstr ""
|
||||
|
||||
#: lib/qemu.c:419
|
||||
#: lib/qemu.c:432
|
||||
msgid ""
|
||||
"discard cannot be enabled on this drive: the drive has a read-only overlay"
|
||||
msgstr ""
|
||||
|
||||
#: lib/qemu.c:426
|
||||
#: lib/qemu.c:439
|
||||
msgid ""
|
||||
"discard cannot be enabled on this drive: you have to specify the format of "
|
||||
"the file"
|
||||
msgstr ""
|
||||
|
||||
#: lib/qemu.c:436
|
||||
#: lib/qemu.c:449
|
||||
#, c-format
|
||||
msgid ""
|
||||
"discard cannot be enabled on this drive: qemu does not support discard for "
|
||||
"‘%s’ format files"
|
||||
msgstr ""
|
||||
|
||||
#: lib/qemu.c:456
|
||||
#: lib/qemu.c:469
|
||||
#, c-format
|
||||
msgid ""
|
||||
"discard cannot be enabled on this drive: protocol ‘%s’ does not support "
|
||||
|
||||
Reference in New Issue
Block a user