Compare commits
No commits in common. 'c8-stream-rhel' and 'a9' have entirely different histories.
c8-stream-
...
a9
@ -1,2 +1,2 @@
|
||||
SOURCES/libguestfs-1.44.0.tar.gz
|
||||
SOURCES/libguestfs-1.48.4.tar.gz
|
||||
SOURCES/libguestfs.keyring
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
99d241dc4a5ba0dc6111954ed7a872e0b0bb6944 SOURCES/libguestfs-1.44.0.tar.gz
|
||||
a8754a62256ac488eec3e18bed20f570f785d069 SOURCES/libguestfs-1.48.4.tar.gz
|
||||
1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
|
||||
|
||||
@ -0,0 +1,96 @@
|
||||
From e3ebd50abde3b05db86c8965868c866152cd3287 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Thu, 28 Apr 2022 13:16:54 +0100
|
||||
Subject: [PATCH] New API: guestfs_device_name returning the drive name
|
||||
|
||||
For each drive added, return the name. For example calling this with
|
||||
index 0 will return the string "/dev/sda". I called it
|
||||
guestfs_device_name (not drive_name) for consistency with the existing
|
||||
guestfs_device_index function.
|
||||
|
||||
You don't really need to call this function. You can follow the
|
||||
advice here:
|
||||
https://libguestfs.org/guestfs.3.html#block-device-naming
|
||||
and assume that drives are added with predictable names like
|
||||
"/dev/sda", "/dev/sdb", etc.
|
||||
|
||||
However it's useful to expose the internal guestfs_int_drive_name
|
||||
function since especially handling names beyond index 26 is tricky
|
||||
(https://rwmj.wordpress.com/2011/01/09/how-are-linux-drives-named-beyond-drive-26-devsdz/)
|
||||
|
||||
Fixes: https://github.com/libguestfs/libguestfs/issues/80
|
||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
||||
(cherry picked from commit ac00e603f83802634f1d53b1629aee4670eaf31c)
|
||||
---
|
||||
generator/actions_core.ml | 24 +++++++++++++++++++++++-
|
||||
lib/drives.c | 15 +++++++++++++++
|
||||
2 files changed, 38 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
|
||||
index ce9ee39cc..dc12fdc33 100644
|
||||
--- a/generator/actions_core.ml
|
||||
+++ b/generator/actions_core.ml
|
||||
@@ -737,7 +737,29 @@ returns the index of the device in the list of devices.
|
||||
Index numbers start from 0. The named device must exist,
|
||||
for example as a string returned from C<guestfs_list_devices>.
|
||||
|
||||
-See also C<guestfs_list_devices>, C<guestfs_part_to_dev>." };
|
||||
+See also C<guestfs_list_devices>, C<guestfs_part_to_dev>,
|
||||
+C<guestfs_device_name>." };
|
||||
+
|
||||
+ { defaults with
|
||||
+ name = "device_name"; added = (1, 49, 1);
|
||||
+ style = RString (RPlainString, "name"), [Int "index"], [];
|
||||
+ tests = [
|
||||
+ InitEmpty, Always, TestResult (
|
||||
+ [["device_name"; "0"]], "STREQ (ret, \"/dev/sda\")"), [];
|
||||
+ InitEmpty, Always, TestResult (
|
||||
+ [["device_name"; "1"]], "STREQ (ret, \"/dev/sdb\")"), [];
|
||||
+ InitEmpty, Always, TestLastFail (
|
||||
+ [["device_name"; "99"]]), []
|
||||
+ ];
|
||||
+ shortdesc = "convert device index to name";
|
||||
+ longdesc = "\
|
||||
+This function takes a device index and returns the device
|
||||
+name. For example index C<0> will return the string C</dev/sda>.
|
||||
+
|
||||
+The drive index must have been added to the handle.
|
||||
+
|
||||
+See also C<guestfs_list_devices>, C<guestfs_part_to_dev>,
|
||||
+C<guestfs_device_index>." };
|
||||
|
||||
{ defaults with
|
||||
name = "shutdown"; added = (1, 19, 16);
|
||||
diff --git a/lib/drives.c b/lib/drives.c
|
||||
index fd95308d2..a6179fc36 100644
|
||||
--- a/lib/drives.c
|
||||
+++ b/lib/drives.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <netdb.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <assert.h>
|
||||
+#include <errno.h>
|
||||
#include <libintl.h>
|
||||
|
||||
#include "c-ctype.h"
|
||||
@@ -1084,3 +1085,17 @@ guestfs_impl_device_index (guestfs_h *g, const char *device)
|
||||
error (g, _("%s: device not found"), device);
|
||||
return r;
|
||||
}
|
||||
+
|
||||
+char *
|
||||
+guestfs_impl_device_name (guestfs_h *g, int index)
|
||||
+{
|
||||
+ char drive_name[64];
|
||||
+
|
||||
+ if (index < 0 || index >= g->nr_drives) {
|
||||
+ guestfs_int_error_errno (g, EINVAL, _("drive index out of range"));
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ guestfs_int_drive_name (index, drive_name);
|
||||
+ return safe_asprintf (g, "/dev/sd%s", drive_name);
|
||||
+}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From 5b6d2b05fe0c4035b9791a751e3133d26c7baa2d Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Fri, 21 Dec 2012 15:50:11 +0000
|
||||
Subject: [PATCH] RHEL 8: Remove libguestfs live (RHBZ#798980).
|
||||
|
||||
This isn't supported in RHEL 8.
|
||||
|
||||
Disable daemon tests that require the 'unix' backend.
|
||||
---
|
||||
lib/launch-unix.c | 7 +++++++
|
||||
tests/daemon/Makefile.am | 4 +---
|
||||
2 files changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/launch-unix.c b/lib/launch-unix.c
|
||||
index 0d344f9df..74dd1bb4a 100644
|
||||
--- a/lib/launch-unix.c
|
||||
+++ b/lib/launch-unix.c
|
||||
@@ -37,6 +37,12 @@
|
||||
static int
|
||||
launch_unix (guestfs_h *g, void *datav, const char *sockpath)
|
||||
{
|
||||
+ error (g,
|
||||
+ "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n"
|
||||
+ "In particular, \"libguestfs live\" is not supported.");
|
||||
+ return -1;
|
||||
+
|
||||
+#if 0
|
||||
int r, daemon_sock = -1;
|
||||
struct sockaddr_un addr;
|
||||
uint32_t size;
|
||||
@@ -106,6 +112,7 @@ launch_unix (guestfs_h *g, void *datav, const char *sockpath)
|
||||
g->conn = NULL;
|
||||
}
|
||||
return -1;
|
||||
+#endif
|
||||
}
|
||||
|
||||
static int
|
||||
diff --git a/tests/daemon/Makefile.am b/tests/daemon/Makefile.am
|
||||
index 921e6d1df..8b2887247 100644
|
||||
--- a/tests/daemon/Makefile.am
|
||||
+++ b/tests/daemon/Makefile.am
|
||||
@@ -23,9 +23,7 @@ include $(top_srcdir)/subdir-rules.mk
|
||||
|
||||
check_DATA = captive-daemon.pm
|
||||
|
||||
-TESTS = \
|
||||
- test-daemon-start.pl \
|
||||
- test-btrfs.pl
|
||||
+TESTS =
|
||||
|
||||
TESTS_ENVIRONMENT = $(top_builddir)/run --test
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,330 +0,0 @@
|
||||
From 91b2a6e50211c58ea31a36351ec63c358f708bf9 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Thu, 18 Jul 2013 18:31:53 +0100
|
||||
Subject: [PATCH] RHEL 8: Remove 9p APIs from RHEL (RHBZ#921710).
|
||||
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
daemon/9p.c | 182 --------------------------------------
|
||||
daemon/Makefile.am | 1 -
|
||||
docs/C_SOURCE_FILES | 1 -
|
||||
generator/actions_core.ml | 21 -----
|
||||
generator/proc_nr.ml | 2 -
|
||||
gobject/Makefile.inc | 2 -
|
||||
po/POTFILES | 2 -
|
||||
8 files changed, 1 insertion(+), 212 deletions(-)
|
||||
delete mode 100644 daemon/9p.c
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 3df1b6a7a..36e44dfd5 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -78,7 +78,7 @@ SUBDIRS += tests/xfs
|
||||
SUBDIRS += tests/charsets
|
||||
SUBDIRS += tests/xml
|
||||
SUBDIRS += tests/mount-local
|
||||
-SUBDIRS += tests/9p
|
||||
+#SUBDIRS += tests/9p
|
||||
SUBDIRS += tests/rsync
|
||||
SUBDIRS += tests/bigdirs
|
||||
SUBDIRS += tests/disk-labels
|
||||
diff --git a/daemon/9p.c b/daemon/9p.c
|
||||
deleted file mode 100644
|
||||
index 743a96abd..000000000
|
||||
--- a/daemon/9p.c
|
||||
+++ /dev/null
|
||||
@@ -1,182 +0,0 @@
|
||||
-/* libguestfs - the guestfsd daemon
|
||||
- * Copyright (C) 2011 Red Hat Inc.
|
||||
- *
|
||||
- * This program is free software; you can redistribute it and/or modify
|
||||
- * it under the terms of the GNU General Public License as published by
|
||||
- * the Free Software Foundation; either version 2 of the License, or
|
||||
- * (at your option) any later version.
|
||||
- *
|
||||
- * This program 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 General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
- */
|
||||
-
|
||||
-#include <config.h>
|
||||
-
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
-#include <unistd.h>
|
||||
-#include <limits.h>
|
||||
-#include <errno.h>
|
||||
-#include <sys/types.h>
|
||||
-#include <sys/stat.h>
|
||||
-#include <dirent.h>
|
||||
-#include <fcntl.h>
|
||||
-
|
||||
-#include "ignore-value.h"
|
||||
-
|
||||
-#include "daemon.h"
|
||||
-#include "actions.h"
|
||||
-
|
||||
-#define BUS_PATH "/sys/bus/virtio/drivers/9pnet_virtio"
|
||||
-
|
||||
-static void
|
||||
-modprobe_9pnet_virtio (void)
|
||||
-{
|
||||
- /* Required with Linux 5.6 and maybe earlier kernels. For unclear
|
||||
- * reasons the module is not an automatic dependency of the 9p
|
||||
- * module so doesn't get loaded automatically.
|
||||
- */
|
||||
- ignore_value (command (NULL, NULL, "modprobe", "9pnet_virtio", NULL));
|
||||
-}
|
||||
-
|
||||
-/* https://bugzilla.redhat.com/show_bug.cgi?id=714981#c1 */
|
||||
-char **
|
||||
-do_list_9p (void)
|
||||
-{
|
||||
- CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (r);
|
||||
- DIR *dir;
|
||||
-
|
||||
- modprobe_9pnet_virtio ();
|
||||
-
|
||||
- dir = opendir (BUS_PATH);
|
||||
- if (!dir) {
|
||||
- perror ("opendir: " BUS_PATH);
|
||||
- if (errno != ENOENT) {
|
||||
- reply_with_perror ("opendir: " BUS_PATH);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* If this directory doesn't exist, it probably means that
|
||||
- * the virtio driver isn't loaded. Don't return an error
|
||||
- * in this case, but return an empty list.
|
||||
- */
|
||||
- if (end_stringsbuf (&r) == -1)
|
||||
- return NULL;
|
||||
-
|
||||
- return take_stringsbuf (&r);
|
||||
- }
|
||||
-
|
||||
- while (1) {
|
||||
- struct dirent *d;
|
||||
-
|
||||
- errno = 0;
|
||||
- d = readdir (dir);
|
||||
- if (d == NULL) break;
|
||||
-
|
||||
- if (STRPREFIX (d->d_name, "virtio")) {
|
||||
- CLEANUP_FREE char *mount_tag_path = NULL;
|
||||
- if (asprintf (&mount_tag_path, BUS_PATH "/%s/mount_tag",
|
||||
- d->d_name) == -1) {
|
||||
- reply_with_perror ("asprintf");
|
||||
- closedir (dir);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* A bit unclear, but it looks like the virtio transport allows
|
||||
- * the mount tag length to be unlimited (or up to 65536 bytes).
|
||||
- * See: linux/include/linux/virtio_9p.h
|
||||
- */
|
||||
- CLEANUP_FREE char *mount_tag = read_whole_file (mount_tag_path, NULL);
|
||||
- if (mount_tag == 0)
|
||||
- continue;
|
||||
-
|
||||
- if (add_string (&r, mount_tag) == -1) {
|
||||
- closedir (dir);
|
||||
- return NULL;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* Check readdir didn't fail */
|
||||
- if (errno != 0) {
|
||||
- reply_with_perror ("readdir: /sys/block");
|
||||
- closedir (dir);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* Close the directory handle */
|
||||
- if (closedir (dir) == -1) {
|
||||
- reply_with_perror ("closedir: /sys/block");
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- /* Sort the tags. */
|
||||
- if (r.size > 0)
|
||||
- sort_strings (r.argv, r.size);
|
||||
-
|
||||
- /* NULL terminate the list */
|
||||
- if (end_stringsbuf (&r) == -1)
|
||||
- return NULL;
|
||||
-
|
||||
- return take_stringsbuf (&r);
|
||||
-}
|
||||
-
|
||||
-/* Takes optional arguments, consult optargs_bitmask. */
|
||||
-int
|
||||
-do_mount_9p (const char *mount_tag, const char *mountpoint, const char *options)
|
||||
-{
|
||||
- CLEANUP_FREE char *mp = NULL, *opts = NULL, *err = NULL;
|
||||
- struct stat statbuf;
|
||||
- int r;
|
||||
-
|
||||
- ABS_PATH (mountpoint, 0, return -1);
|
||||
-
|
||||
- mp = sysroot_path (mountpoint);
|
||||
- if (!mp) {
|
||||
- reply_with_perror ("malloc");
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- /* Check the mountpoint exists and is a directory. */
|
||||
- if (stat (mp, &statbuf) == -1) {
|
||||
- reply_with_perror ("%s", mountpoint);
|
||||
- return -1;
|
||||
- }
|
||||
- if (!S_ISDIR (statbuf.st_mode)) {
|
||||
- reply_with_perror ("%s: mount point is not a directory", mountpoint);
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- /* Add trans=virtio to the options. */
|
||||
- if ((optargs_bitmask & GUESTFS_MOUNT_9P_OPTIONS_BITMASK) &&
|
||||
- STRNEQ (options, "")) {
|
||||
- if (asprintf (&opts, "trans=virtio,%s", options) == -1) {
|
||||
- reply_with_perror ("asprintf");
|
||||
- return -1;
|
||||
- }
|
||||
- }
|
||||
- else {
|
||||
- opts = strdup ("trans=virtio");
|
||||
- if (opts == NULL) {
|
||||
- reply_with_perror ("strdup");
|
||||
- return -1;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- modprobe_9pnet_virtio ();
|
||||
- r = command (NULL, &err,
|
||||
- "mount", "-o", opts, "-t", "9p", mount_tag, mp, NULL);
|
||||
- if (r == -1) {
|
||||
- reply_with_error ("%s on %s: %s", mount_tag, mountpoint, err);
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
|
||||
index 038be592c..df9dcc4ee 100644
|
||||
--- a/daemon/Makefile.am
|
||||
+++ b/daemon/Makefile.am
|
||||
@@ -82,7 +82,6 @@ guestfsd_SOURCES = \
|
||||
../common/protocol/guestfs_protocol.h \
|
||||
../common/utils/cleanups.h \
|
||||
../common/utils/guestfs-utils.h \
|
||||
- 9p.c \
|
||||
acl.c \
|
||||
actions.h \
|
||||
available.c \
|
||||
diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
|
||||
index cd5bd2924..831b7e25a 100644
|
||||
--- a/docs/C_SOURCE_FILES
|
||||
+++ b/docs/C_SOURCE_FILES
|
||||
@@ -63,7 +63,6 @@ common/windows/windows.c
|
||||
common/windows/windows.h
|
||||
customize/crypt-c.c
|
||||
customize/perl_edit-c.c
|
||||
-daemon/9p.c
|
||||
daemon/acl.c
|
||||
daemon/actions.h
|
||||
daemon/augeas.c
|
||||
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
|
||||
index 806565b19..37476c93e 100644
|
||||
--- a/generator/actions_core.ml
|
||||
+++ b/generator/actions_core.ml
|
||||
@@ -6157,27 +6157,6 @@ This returns true iff the device exists and contains all zero bytes.
|
||||
|
||||
Note that for large devices this can take a long time to run." };
|
||||
|
||||
- { defaults with
|
||||
- name = "list_9p"; added = (1, 11, 12);
|
||||
- style = RStringList (RPlainString, "mounttags"), [], [];
|
||||
- shortdesc = "list 9p filesystems";
|
||||
- longdesc = "\
|
||||
-List all 9p filesystems attached to the guest. A list of
|
||||
-mount tags is returned." };
|
||||
-
|
||||
- { defaults with
|
||||
- name = "mount_9p"; added = (1, 11, 12);
|
||||
- style = RErr, [String (PlainString, "mounttag"); String (PlainString, "mountpoint")], [OString "options"];
|
||||
- camel_name = "Mount9P";
|
||||
- shortdesc = "mount 9p filesystem";
|
||||
- longdesc = "\
|
||||
-Mount the virtio-9p filesystem with the tag C<mounttag> on the
|
||||
-directory C<mountpoint>.
|
||||
-
|
||||
-If required, C<trans=virtio> will be automatically added to the options.
|
||||
-Any other options required can be passed in the optional C<options>
|
||||
-parameter." };
|
||||
-
|
||||
{ defaults with
|
||||
name = "list_dm_devices"; added = (1, 11, 15);
|
||||
style = RStringList (RDevice, "devices"), [], [];
|
||||
diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
|
||||
index 30e42864f..57976be36 100644
|
||||
--- a/generator/proc_nr.ml
|
||||
+++ b/generator/proc_nr.ml
|
||||
@@ -295,8 +295,6 @@ let proc_nr = [
|
||||
282, "internal_autosync";
|
||||
283, "is_zero";
|
||||
284, "is_zero_device";
|
||||
-285, "list_9p";
|
||||
-286, "mount_9p";
|
||||
287, "list_dm_devices";
|
||||
288, "ntfsresize";
|
||||
289, "btrfs_filesystem_resize";
|
||||
diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc
|
||||
index 650f8ddac..c4e735967 100644
|
||||
--- a/gobject/Makefile.inc
|
||||
+++ b/gobject/Makefile.inc
|
||||
@@ -94,7 +94,6 @@ guestfs_gobject_headers= \
|
||||
include/guestfs-gobject/optargs-mksquashfs.h \
|
||||
include/guestfs-gobject/optargs-mkswap.h \
|
||||
include/guestfs-gobject/optargs-mktemp.h \
|
||||
- include/guestfs-gobject/optargs-mount_9p.h \
|
||||
include/guestfs-gobject/optargs-mount_local.h \
|
||||
include/guestfs-gobject/optargs-ntfsclone_out.h \
|
||||
include/guestfs-gobject/optargs-ntfsfix.h \
|
||||
@@ -188,7 +187,6 @@ guestfs_gobject_sources= \
|
||||
src/optargs-mksquashfs.c \
|
||||
src/optargs-mkswap.c \
|
||||
src/optargs-mktemp.c \
|
||||
- src/optargs-mount_9p.c \
|
||||
src/optargs-mount_local.c \
|
||||
src/optargs-ntfsclone_out.c \
|
||||
src/optargs-ntfsfix.c \
|
||||
diff --git a/po/POTFILES b/po/POTFILES
|
||||
index 69ea7134a..0782e8ceb 100644
|
||||
--- a/po/POTFILES
|
||||
+++ b/po/POTFILES
|
||||
@@ -47,7 +47,6 @@ common/visit/visit.c
|
||||
common/windows/windows.c
|
||||
customize/crypt-c.c
|
||||
customize/perl_edit-c.c
|
||||
-daemon/9p.c
|
||||
daemon/acl.c
|
||||
daemon/augeas.c
|
||||
daemon/available.c
|
||||
@@ -277,7 +276,6 @@ gobject/src/optargs-mkfs_btrfs.c
|
||||
gobject/src/optargs-mksquashfs.c
|
||||
gobject/src/optargs-mkswap.c
|
||||
gobject/src/optargs-mktemp.c
|
||||
-gobject/src/optargs-mount_9p.c
|
||||
gobject/src/optargs-mount_local.c
|
||||
gobject/src/optargs-ntfsclone_out.c
|
||||
gobject/src/optargs-ntfsfix.c
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,565 @@
|
||||
From b97b90779d5ea261d5e737f073bb4ec5dc546511 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Mon, 2 May 2022 10:56:00 +0200
|
||||
Subject: [PATCH] guestfs_readdir(): rewrite with FileOut transfer, to lift
|
||||
protocol limit
|
||||
|
||||
Currently the guestfs_readdir() API can not list long directories, due to
|
||||
it sending back the whole directory listing in a single guestfs protocol
|
||||
response, which is limited to GUESTFS_MESSAGE_MAX (approx. 4MB) in size.
|
||||
|
||||
Introduce the "internal_readdir" action, for transferring the directory
|
||||
listing from the daemon to the library through a FileOut parameter.
|
||||
Rewrite guestfs_readdir() on top of this new internal function:
|
||||
|
||||
- The new "internal_readdir" action is a daemon action. Do not repurpose
|
||||
the "readdir" proc_nr (138) for "internal_readdir", as some distros ship
|
||||
the binary appliance to their users, and reusing the proc_nr could
|
||||
create a mismatch between library & appliance with obscure symptoms.
|
||||
Replace the old proc_nr (138) with a new proc_nr (511) instead; a
|
||||
mismatch would then produce a clear error message. Assume the new action
|
||||
will first be released in libguestfs-1.48.2.
|
||||
|
||||
- Turn "readdir" from a daemon action into a non-daemon one. Call the
|
||||
daemon action guestfs_internal_readdir() manually, receive the FileOut
|
||||
parameter into a temp file, then deserialize the dirents array from the
|
||||
temp file.
|
||||
|
||||
This patch sneakily fixes an independent bug, too. In the pre-patch
|
||||
do_readdir() function [daemon/readdir.c], when readdir() returns NULL, we
|
||||
don't distinguish "end of directory stream" from "readdir() failed". This
|
||||
rewrite fixes this problem -- I didn't see much value separating out the
|
||||
fix for the original do_readdir().
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1674392
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20220502085601.15012-2-lersek@redhat.com>
|
||||
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
(cherry picked from commit 45b7f1736b64e9f0741e21e5a9d83a837bd863bf)
|
||||
---
|
||||
TODO | 8 ---
|
||||
daemon/readdir.c | 132 +++++++++++++++++++-------------------
|
||||
generator/actions_core.ml | 127 +++++++++++++++++++-----------------
|
||||
generator/proc_nr.ml | 2 +-
|
||||
lib/MAX_PROC_NR | 2 +-
|
||||
lib/Makefile.am | 1 +
|
||||
lib/readdir.c | 131 +++++++++++++++++++++++++++++++++++++
|
||||
7 files changed, 267 insertions(+), 136 deletions(-)
|
||||
create mode 100644 lib/readdir.c
|
||||
|
||||
diff --git a/TODO b/TODO
|
||||
index a50f7d73c..513e55f92 100644
|
||||
--- a/TODO
|
||||
+++ b/TODO
|
||||
@@ -484,14 +484,6 @@ this approach works, it doesn't solve the MBR problem, so likely we'd
|
||||
have to write a library for that (or perhaps go back to sfdisk but
|
||||
using a very abstracted interface over sfdisk).
|
||||
|
||||
-Reimplement some APIs to avoid protocol limits
|
||||
-----------------------------------------------
|
||||
-
|
||||
-Mostly this item was done (eg. commits a69f44f56f and before). The
|
||||
-most notable API with a protocol limit remaining is:
|
||||
-
|
||||
- - guestfs_readdir
|
||||
-
|
||||
hivex
|
||||
-----
|
||||
|
||||
diff --git a/daemon/readdir.c b/daemon/readdir.c
|
||||
index e488f93e7..9ab0b0aec 100644
|
||||
--- a/daemon/readdir.c
|
||||
+++ b/daemon/readdir.c
|
||||
@@ -16,77 +16,67 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
-#include <config.h>
|
||||
+#include <config.h> /* HAVE_STRUCT_DIRENT_D_TYPE */
|
||||
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
-#include <unistd.h>
|
||||
-#include <dirent.h>
|
||||
+#include <dirent.h> /* readdir() */
|
||||
+#include <errno.h> /* errno */
|
||||
+#include <rpc/xdr.h> /* xdrmem_create() */
|
||||
+#include <stdio.h> /* perror() */
|
||||
+#include <stdlib.h> /* malloc() */
|
||||
+#include <sys/types.h> /* opendir() */
|
||||
|
||||
-#include "daemon.h"
|
||||
-#include "actions.h"
|
||||
+#include "daemon.h" /* reply_with_perror() */
|
||||
|
||||
-static void
|
||||
-free_int_dirent_list (guestfs_int_dirent *p, size_t len)
|
||||
+/* Has one FileOut parameter. */
|
||||
+int
|
||||
+do_internal_readdir (const char *dir)
|
||||
{
|
||||
- size_t i;
|
||||
+ int ret;
|
||||
+ DIR *dirstream;
|
||||
+ void *xdr_buf;
|
||||
+ XDR xdr;
|
||||
|
||||
- for (i = 0; i < len; ++i) {
|
||||
- free (p[i].name);
|
||||
- }
|
||||
- free (p);
|
||||
-}
|
||||
-
|
||||
-guestfs_int_dirent_list *
|
||||
-do_readdir (const char *path)
|
||||
-{
|
||||
- guestfs_int_dirent_list *ret;
|
||||
- guestfs_int_dirent v;
|
||||
- DIR *dir;
|
||||
- struct dirent *d;
|
||||
- size_t i;
|
||||
-
|
||||
- ret = malloc (sizeof *ret);
|
||||
- if (ret == NULL) {
|
||||
- reply_with_perror ("malloc");
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- ret->guestfs_int_dirent_list_len = 0;
|
||||
- ret->guestfs_int_dirent_list_val = NULL;
|
||||
+ /* Prepare to fail. */
|
||||
+ ret = -1;
|
||||
|
||||
CHROOT_IN;
|
||||
- dir = opendir (path);
|
||||
+ dirstream = opendir (dir);
|
||||
CHROOT_OUT;
|
||||
|
||||
- if (dir == NULL) {
|
||||
- reply_with_perror ("opendir: %s", path);
|
||||
- free (ret);
|
||||
- return NULL;
|
||||
+ if (dirstream == NULL) {
|
||||
+ reply_with_perror ("opendir: %s", dir);
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
- i = 0;
|
||||
- while ((d = readdir (dir)) != NULL) {
|
||||
- guestfs_int_dirent *p;
|
||||
+ xdr_buf = malloc (GUESTFS_MAX_CHUNK_SIZE);
|
||||
+ if (xdr_buf == NULL) {
|
||||
+ reply_with_perror ("malloc");
|
||||
+ goto close_dir;
|
||||
+ }
|
||||
+ xdrmem_create (&xdr, xdr_buf, GUESTFS_MAX_CHUNK_SIZE, XDR_ENCODE);
|
||||
+
|
||||
+ /* Send an "OK" reply, before starting the file transfer. */
|
||||
+ reply (NULL, NULL);
|
||||
+
|
||||
+ /* From this point on, we can only report errors by canceling the file
|
||||
+ * transfer.
|
||||
+ */
|
||||
+ for (;;) {
|
||||
+ struct dirent *d;
|
||||
+ guestfs_int_dirent v;
|
||||
+
|
||||
+ errno = 0;
|
||||
+ d = readdir (dirstream);
|
||||
+ if (d == NULL) {
|
||||
+ if (errno == 0)
|
||||
+ ret = 0;
|
||||
+ else
|
||||
+ perror ("readdir");
|
||||
|
||||
- p = realloc (ret->guestfs_int_dirent_list_val,
|
||||
- sizeof (guestfs_int_dirent) * (i+1));
|
||||
- v.name = strdup (d->d_name);
|
||||
- if (!p || !v.name) {
|
||||
- reply_with_perror ("allocate");
|
||||
- if (p) {
|
||||
- free_int_dirent_list (p, i);
|
||||
- } else {
|
||||
- free_int_dirent_list (ret->guestfs_int_dirent_list_val, i);
|
||||
- }
|
||||
- free (v.name);
|
||||
- free (ret);
|
||||
- closedir (dir);
|
||||
- return NULL;
|
||||
+ break;
|
||||
}
|
||||
- ret->guestfs_int_dirent_list_val = p;
|
||||
|
||||
+ v.name = d->d_name;
|
||||
v.ino = d->d_ino;
|
||||
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
|
||||
switch (d->d_type) {
|
||||
@@ -104,19 +94,29 @@ do_readdir (const char *path)
|
||||
v.ftyp = 'u';
|
||||
#endif
|
||||
|
||||
- ret->guestfs_int_dirent_list_val[i] = v;
|
||||
+ if (!xdr_guestfs_int_dirent (&xdr, &v)) {
|
||||
+ fprintf (stderr, "xdr_guestfs_int_dirent failed\n");
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
- i++;
|
||||
+ if (send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
|
||||
+ break;
|
||||
+
|
||||
+ xdr_setpos (&xdr, 0);
|
||||
}
|
||||
|
||||
- ret->guestfs_int_dirent_list_len = i;
|
||||
+ /* Finish or cancel the transfer. Note that if (ret == -1) because the library
|
||||
+ * canceled, we still need to cancel back!
|
||||
+ */
|
||||
+ send_file_end (ret == -1);
|
||||
|
||||
- if (closedir (dir) == -1) {
|
||||
- reply_with_perror ("closedir");
|
||||
- free (ret->guestfs_int_dirent_list_val);
|
||||
- free (ret);
|
||||
- return NULL;
|
||||
- }
|
||||
+ xdr_destroy (&xdr);
|
||||
+ free (xdr_buf);
|
||||
+
|
||||
+close_dir:
|
||||
+ if (closedir (dirstream) == -1)
|
||||
+ /* Best we can do here is log an error. */
|
||||
+ perror ("closedir");
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
|
||||
index dc12fdc33..807150615 100644
|
||||
--- a/generator/actions_core.ml
|
||||
+++ b/generator/actions_core.ml
|
||||
@@ -141,6 +141,66 @@ only useful for printing debug and internal error messages.
|
||||
|
||||
For more information on states, see L<guestfs(3)>." };
|
||||
|
||||
+ { defaults with
|
||||
+ name = "readdir"; added = (1, 0, 55);
|
||||
+ style = RStructList ("entries", "dirent"), [String (Pathname, "dir")], [];
|
||||
+ progress = true; cancellable = true;
|
||||
+ shortdesc = "read directories entries";
|
||||
+ longdesc = "\
|
||||
+This returns the list of directory entries in directory C<dir>.
|
||||
+
|
||||
+All entries in the directory are returned, including C<.> and
|
||||
+C<..>. The entries are I<not> sorted, but returned in the same
|
||||
+order as the underlying filesystem.
|
||||
+
|
||||
+Also this call returns basic file type information about each
|
||||
+file. The C<ftyp> field will contain one of the following characters:
|
||||
+
|
||||
+=over 4
|
||||
+
|
||||
+=item 'b'
|
||||
+
|
||||
+Block special
|
||||
+
|
||||
+=item 'c'
|
||||
+
|
||||
+Char special
|
||||
+
|
||||
+=item 'd'
|
||||
+
|
||||
+Directory
|
||||
+
|
||||
+=item 'f'
|
||||
+
|
||||
+FIFO (named pipe)
|
||||
+
|
||||
+=item 'l'
|
||||
+
|
||||
+Symbolic link
|
||||
+
|
||||
+=item 'r'
|
||||
+
|
||||
+Regular file
|
||||
+
|
||||
+=item 's'
|
||||
+
|
||||
+Socket
|
||||
+
|
||||
+=item 'u'
|
||||
+
|
||||
+Unknown file type
|
||||
+
|
||||
+=item '?'
|
||||
+
|
||||
+The L<readdir(3)> call returned a C<d_type> field with an
|
||||
+unexpected value
|
||||
+
|
||||
+=back
|
||||
+
|
||||
+This function is primarily intended for use by programs. To
|
||||
+get a simple list of names, use C<guestfs_ls>. To get a printable
|
||||
+directory for human consumption, use C<guestfs_ll>." };
|
||||
+
|
||||
{ defaults with
|
||||
name = "version"; added = (1, 0, 58);
|
||||
style = RStruct ("version", "version"), [], [];
|
||||
@@ -3939,66 +3999,6 @@ L<umask(2)>, C<guestfs_mknod>, C<guestfs_mkdir>.
|
||||
|
||||
This call returns the previous umask." };
|
||||
|
||||
- { defaults with
|
||||
- name = "readdir"; added = (1, 0, 55);
|
||||
- style = RStructList ("entries", "dirent"), [String (Pathname, "dir")], [];
|
||||
- protocol_limit_warning = true;
|
||||
- shortdesc = "read directories entries";
|
||||
- longdesc = "\
|
||||
-This returns the list of directory entries in directory C<dir>.
|
||||
-
|
||||
-All entries in the directory are returned, including C<.> and
|
||||
-C<..>. The entries are I<not> sorted, but returned in the same
|
||||
-order as the underlying filesystem.
|
||||
-
|
||||
-Also this call returns basic file type information about each
|
||||
-file. The C<ftyp> field will contain one of the following characters:
|
||||
-
|
||||
-=over 4
|
||||
-
|
||||
-=item 'b'
|
||||
-
|
||||
-Block special
|
||||
-
|
||||
-=item 'c'
|
||||
-
|
||||
-Char special
|
||||
-
|
||||
-=item 'd'
|
||||
-
|
||||
-Directory
|
||||
-
|
||||
-=item 'f'
|
||||
-
|
||||
-FIFO (named pipe)
|
||||
-
|
||||
-=item 'l'
|
||||
-
|
||||
-Symbolic link
|
||||
-
|
||||
-=item 'r'
|
||||
-
|
||||
-Regular file
|
||||
-
|
||||
-=item 's'
|
||||
-
|
||||
-Socket
|
||||
-
|
||||
-=item 'u'
|
||||
-
|
||||
-Unknown file type
|
||||
-
|
||||
-=item '?'
|
||||
-
|
||||
-The L<readdir(3)> call returned a C<d_type> field with an
|
||||
-unexpected value
|
||||
-
|
||||
-=back
|
||||
-
|
||||
-This function is primarily intended for use by programs. To
|
||||
-get a simple list of names, use C<guestfs_ls>. To get a printable
|
||||
-directory for human consumption, use C<guestfs_ll>." };
|
||||
-
|
||||
{ defaults with
|
||||
name = "getxattrs"; added = (1, 0, 59);
|
||||
style = RStructList ("xattrs", "xattr"), [String (Pathname, "path")], [];
|
||||
@@ -9713,4 +9713,11 @@ C<guestfs_cryptsetup_open>. The C<device> parameter must be
|
||||
the name of the mapping device (ie. F</dev/mapper/mapname>)
|
||||
and I<not> the name of the underlying block device." };
|
||||
|
||||
+ { defaults with
|
||||
+ name = "internal_readdir"; added = (1, 48, 2);
|
||||
+ style = RErr, [String (Pathname, "dir"); String (FileOut, "filename")], [];
|
||||
+ visibility = VInternal;
|
||||
+ shortdesc = "read directories entries";
|
||||
+ longdesc = "Internal function for readdir." };
|
||||
+
|
||||
]
|
||||
diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
|
||||
index b20672ff0..bdced51c9 100644
|
||||
--- a/generator/proc_nr.ml
|
||||
+++ b/generator/proc_nr.ml
|
||||
@@ -152,7 +152,6 @@ let proc_nr = [
|
||||
135, "mknod_b";
|
||||
136, "mknod_c";
|
||||
137, "umask";
|
||||
-138, "readdir";
|
||||
139, "sfdiskM";
|
||||
140, "zfile";
|
||||
141, "getxattrs";
|
||||
@@ -514,6 +513,7 @@ let proc_nr = [
|
||||
508, "cryptsetup_open";
|
||||
509, "cryptsetup_close";
|
||||
510, "internal_list_rpm_applications";
|
||||
+511, "internal_readdir";
|
||||
]
|
||||
|
||||
(* End of list. If adding a new entry, add it at the end of the list
|
||||
diff --git a/lib/MAX_PROC_NR b/lib/MAX_PROC_NR
|
||||
index 2bc4cd64b..c0556fb20 100644
|
||||
--- a/lib/MAX_PROC_NR
|
||||
+++ b/lib/MAX_PROC_NR
|
||||
@@ -1 +1 @@
|
||||
-510
|
||||
+511
|
||||
diff --git a/lib/Makefile.am b/lib/Makefile.am
|
||||
index 144c45588..212bcb94a 100644
|
||||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -105,6 +105,7 @@ libguestfs_la_SOURCES = \
|
||||
private-data.c \
|
||||
proto.c \
|
||||
qemu.c \
|
||||
+ readdir.c \
|
||||
rescue.c \
|
||||
stringsbuf.c \
|
||||
structs-compare.c \
|
||||
diff --git a/lib/readdir.c b/lib/readdir.c
|
||||
new file mode 100644
|
||||
index 000000000..9cb0d7cf6
|
||||
--- /dev/null
|
||||
+++ b/lib/readdir.c
|
||||
@@ -0,0 +1,131 @@
|
||||
+/* libguestfs
|
||||
+ * Copyright (C) 2016-2022 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 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, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ */
|
||||
+
|
||||
+#include <config.h> /* UNIX_PATH_MAX, needed by "guestfs-internal.h" */
|
||||
+
|
||||
+#include <rpc/xdr.h> /* xdrstdio_create() */
|
||||
+#include <stdint.h> /* UINT32_MAX */
|
||||
+#include <stdio.h> /* fopen() */
|
||||
+#include <string.h> /* memset() */
|
||||
+
|
||||
+#include "guestfs.h" /* guestfs_internal_readdir() */
|
||||
+#include "guestfs_protocol.h" /* guestfs_int_dirent */
|
||||
+#include "guestfs-internal.h" /* guestfs_int_make_temp_path() */
|
||||
+#include "guestfs-internal-actions.h" /* guestfs_impl_readdir */
|
||||
+
|
||||
+struct guestfs_dirent_list *
|
||||
+guestfs_impl_readdir (guestfs_h *g, const char *dir)
|
||||
+{
|
||||
+ struct guestfs_dirent_list *ret;
|
||||
+ char *tmpfn;
|
||||
+ FILE *f;
|
||||
+ off_t fsize;
|
||||
+ XDR xdr;
|
||||
+ struct guestfs_dirent_list *dirents;
|
||||
+ uint32_t alloc_entries;
|
||||
+ size_t alloc_bytes;
|
||||
+
|
||||
+ /* Prepare to fail. */
|
||||
+ ret = NULL;
|
||||
+
|
||||
+ tmpfn = guestfs_int_make_temp_path (g, "readdir", NULL);
|
||||
+ if (tmpfn == NULL)
|
||||
+ return ret;
|
||||
+
|
||||
+ if (guestfs_internal_readdir (g, dir, tmpfn) == -1)
|
||||
+ goto drop_tmpfile;
|
||||
+
|
||||
+ f = fopen (tmpfn, "r");
|
||||
+ if (f == NULL) {
|
||||
+ perrorf (g, "fopen: %s", tmpfn);
|
||||
+ goto drop_tmpfile;
|
||||
+ }
|
||||
+
|
||||
+ if (fseeko (f, 0, SEEK_END) == -1) {
|
||||
+ perrorf (g, "fseeko");
|
||||
+ goto close_tmpfile;
|
||||
+ }
|
||||
+ fsize = ftello (f);
|
||||
+ if (fsize == -1) {
|
||||
+ perrorf (g, "ftello");
|
||||
+ goto close_tmpfile;
|
||||
+ }
|
||||
+ if (fseeko (f, 0, SEEK_SET) == -1) {
|
||||
+ perrorf (g, "fseeko");
|
||||
+ goto close_tmpfile;
|
||||
+ }
|
||||
+
|
||||
+ xdrstdio_create (&xdr, f, XDR_DECODE);
|
||||
+
|
||||
+ dirents = safe_malloc (g, sizeof *dirents);
|
||||
+ dirents->len = 0;
|
||||
+ alloc_entries = 8;
|
||||
+ alloc_bytes = alloc_entries * sizeof *dirents->val;
|
||||
+ dirents->val = safe_malloc (g, alloc_bytes);
|
||||
+
|
||||
+ while (xdr_getpos (&xdr) < fsize) {
|
||||
+ guestfs_int_dirent v;
|
||||
+ struct guestfs_dirent *d;
|
||||
+
|
||||
+ if (dirents->len == alloc_entries) {
|
||||
+ if (alloc_entries > UINT32_MAX / 2 || alloc_bytes > (size_t)-1 / 2) {
|
||||
+ error (g, "integer overflow");
|
||||
+ goto free_dirents;
|
||||
+ }
|
||||
+ alloc_entries *= 2u;
|
||||
+ alloc_bytes *= 2u;
|
||||
+ dirents->val = safe_realloc (g, dirents->val, alloc_bytes);
|
||||
+ }
|
||||
+
|
||||
+ /* Decoding does not work unless the target buffer is zero-initialized. */
|
||||
+ memset (&v, 0, sizeof v);
|
||||
+ if (!xdr_guestfs_int_dirent (&xdr, &v)) {
|
||||
+ error (g, "xdr_guestfs_int_dirent failed");
|
||||
+ goto free_dirents;
|
||||
+ }
|
||||
+
|
||||
+ d = &dirents->val[dirents->len];
|
||||
+ d->ino = v.ino;
|
||||
+ d->ftyp = v.ftyp;
|
||||
+ d->name = v.name; /* transfer malloc'd string to "d" */
|
||||
+
|
||||
+ dirents->len++;
|
||||
+ }
|
||||
+
|
||||
+ /* Success; transfer "dirents" to "ret". */
|
||||
+ ret = dirents;
|
||||
+ dirents = NULL;
|
||||
+
|
||||
+ /* Clean up. */
|
||||
+ xdr_destroy (&xdr);
|
||||
+
|
||||
+free_dirents:
|
||||
+ guestfs_free_dirent_list (dirents);
|
||||
+
|
||||
+close_tmpfile:
|
||||
+ fclose (f);
|
||||
+
|
||||
+drop_tmpfile:
|
||||
+ /* In case guestfs_internal_readdir() failed, it may or may not have created
|
||||
+ * the temporary file.
|
||||
+ */
|
||||
+ unlink (tmpfn);
|
||||
+ free (tmpfn);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,108 @@
|
||||
From 62cd6c9d2dd62dd24cc04b16437bfb816a6f4357 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Mon, 2 May 2022 10:56:01 +0200
|
||||
Subject: [PATCH] guestfs_readdir(): minimize the number of send_file_write()
|
||||
calls
|
||||
|
||||
In guestfs_readdir(), the daemon currently sends each XDR-encoded
|
||||
"guestfs_int_dirent" to the library with a separate send_file_write()
|
||||
call.
|
||||
|
||||
Determine the largest encoded size (from the longest filename that a
|
||||
"guestfs_int_dirent" could carry, from readdir()'s "struct dirent"), and
|
||||
batch up the XDR encodings until the next encoding might not fit in
|
||||
GUESTFS_MAX_CHUNK_SIZE. Call send_file_write() only then.
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1674392
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20220502085601.15012-3-lersek@redhat.com>
|
||||
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
(cherry picked from commit 4864d21cb8eb991f0fc98d03a068173837cba50e)
|
||||
---
|
||||
daemon/readdir.c | 38 ++++++++++++++++++++++++++++++++------
|
||||
1 file changed, 32 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/daemon/readdir.c b/daemon/readdir.c
|
||||
index 9ab0b0aec..3084ba939 100644
|
||||
--- a/daemon/readdir.c
|
||||
+++ b/daemon/readdir.c
|
||||
@@ -35,6 +35,9 @@ do_internal_readdir (const char *dir)
|
||||
DIR *dirstream;
|
||||
void *xdr_buf;
|
||||
XDR xdr;
|
||||
+ struct dirent fill;
|
||||
+ guestfs_int_dirent v;
|
||||
+ unsigned max_encoded;
|
||||
|
||||
/* Prepare to fail. */
|
||||
ret = -1;
|
||||
@@ -55,6 +58,20 @@ do_internal_readdir (const char *dir)
|
||||
}
|
||||
xdrmem_create (&xdr, xdr_buf, GUESTFS_MAX_CHUNK_SIZE, XDR_ENCODE);
|
||||
|
||||
+ /* Calculate the max number of bytes a "guestfs_int_dirent" can be encoded to.
|
||||
+ */
|
||||
+ memset (fill.d_name, 'a', sizeof fill.d_name - 1);
|
||||
+ fill.d_name[sizeof fill.d_name - 1] = '\0';
|
||||
+ v.ino = INT64_MAX;
|
||||
+ v.ftyp = '?';
|
||||
+ v.name = fill.d_name;
|
||||
+ if (!xdr_guestfs_int_dirent (&xdr, &v)) {
|
||||
+ fprintf (stderr, "xdr_guestfs_int_dirent failed\n");
|
||||
+ goto release_xdr;
|
||||
+ }
|
||||
+ max_encoded = xdr_getpos (&xdr);
|
||||
+ xdr_setpos (&xdr, 0);
|
||||
+
|
||||
/* Send an "OK" reply, before starting the file transfer. */
|
||||
reply (NULL, NULL);
|
||||
|
||||
@@ -63,7 +80,6 @@ do_internal_readdir (const char *dir)
|
||||
*/
|
||||
for (;;) {
|
||||
struct dirent *d;
|
||||
- guestfs_int_dirent v;
|
||||
|
||||
errno = 0;
|
||||
d = readdir (dirstream);
|
||||
@@ -94,22 +110,32 @@ do_internal_readdir (const char *dir)
|
||||
v.ftyp = 'u';
|
||||
#endif
|
||||
|
||||
+ /* Flush "xdr_buf" if we may not have enough room for encoding "v". */
|
||||
+ if (GUESTFS_MAX_CHUNK_SIZE - xdr_getpos (&xdr) < max_encoded) {
|
||||
+ if (send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
|
||||
+ break;
|
||||
+
|
||||
+ xdr_setpos (&xdr, 0);
|
||||
+ }
|
||||
+
|
||||
if (!xdr_guestfs_int_dirent (&xdr, &v)) {
|
||||
fprintf (stderr, "xdr_guestfs_int_dirent failed\n");
|
||||
break;
|
||||
}
|
||||
-
|
||||
- if (send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
|
||||
- break;
|
||||
-
|
||||
- xdr_setpos (&xdr, 0);
|
||||
}
|
||||
|
||||
+ /* Flush "xdr_buf" if the loop completed successfully and "xdr_buf" is not
|
||||
+ * empty. */
|
||||
+ if (ret == 0 && xdr_getpos (&xdr) > 0 &&
|
||||
+ send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
|
||||
+ ret = -1;
|
||||
+
|
||||
/* Finish or cancel the transfer. Note that if (ret == -1) because the library
|
||||
* canceled, we still need to cancel back!
|
||||
*/
|
||||
send_file_end (ret == -1);
|
||||
|
||||
+release_xdr:
|
||||
xdr_destroy (&xdr);
|
||||
free (xdr_buf);
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
From 34f8c6a5eb0eabfba4ab1831b45e2baa73a4b501 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Fri, 19 Sep 2014 13:38:20 +0100
|
||||
Subject: [PATCH] RHEL 8: Remove User-Mode Linux (RHBZ#1144197).
|
||||
|
||||
This isn't supported in RHEL 8.
|
||||
---
|
||||
lib/launch-uml.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/lib/launch-uml.c b/lib/launch-uml.c
|
||||
index 5aec50a57..8b9fcd770 100644
|
||||
--- a/lib/launch-uml.c
|
||||
+++ b/lib/launch-uml.c
|
||||
@@ -44,7 +44,9 @@ struct backend_uml_data {
|
||||
char umid[UML_UMID_LEN+1]; /* umid=<...> unique ID. */
|
||||
};
|
||||
|
||||
+#if 0
|
||||
static void print_vmlinux_command_line (guestfs_h *g, char **argv);
|
||||
+#endif
|
||||
|
||||
/* Run uml_mkcow to create a COW overlay. */
|
||||
static char *
|
||||
@@ -81,6 +83,7 @@ create_cow_overlay_uml (guestfs_h *g, void *datav, struct drive *drv)
|
||||
return make_cow_overlay (g, drv->src.u.path);
|
||||
}
|
||||
|
||||
+#if 0
|
||||
/* Test for features which are not supported by the UML backend.
|
||||
* Possibly some of these should just be warnings, not errors.
|
||||
*/
|
||||
@@ -133,10 +136,17 @@ uml_supported (guestfs_h *g)
|
||||
|
||||
return true;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int
|
||||
launch_uml (guestfs_h *g, void *datav, const char *arg)
|
||||
{
|
||||
+ error (g,
|
||||
+ "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n"
|
||||
+ "In particular, User-Mode Linux (UML) is not supported.");
|
||||
+ return -1;
|
||||
+
|
||||
+#if 0
|
||||
struct backend_uml_data *data = datav;
|
||||
CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (cmdline);
|
||||
int console_sock = -1, daemon_sock = -1;
|
||||
@@ -496,8 +506,10 @@ launch_uml (guestfs_h *g, void *datav, const char *arg)
|
||||
}
|
||||
g->state = CONFIG;
|
||||
return -1;
|
||||
+#endif
|
||||
}
|
||||
|
||||
+#if 0
|
||||
/* This is called from the forked subprocess just before vmlinux runs,
|
||||
* so it can just print the message straight to stderr, where it will
|
||||
* be picked up and funnelled through the usual appliance event API.
|
||||
@@ -527,6 +539,7 @@ print_vmlinux_command_line (guestfs_h *g, char **argv)
|
||||
|
||||
fputc ('\n', stderr);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int
|
||||
shutdown_uml (guestfs_h *g, void *datav, int check_for_errors)
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,123 @@
|
||||
From e4901a4e83f0ab59a525095d2fe1c7f1a38c0aac Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 4 May 2022 15:41:52 +0200
|
||||
Subject: [PATCH] lib: launch-direct: ignore drive "iface" parameter
|
||||
|
||||
Rich said in <https://bugzilla.redhat.com/show_bug.cgi?id=1844341#c1>:
|
||||
|
||||
> The libvirt backend has never allowed the iface parameter. We should
|
||||
> probably ignore it in the direct backend since it's never been possible
|
||||
> to use this parameter correctly.
|
||||
|
||||
Remove the handling of "iface" in the direct (QEMU) backend. Refresh the
|
||||
documentation regarding both backends.
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844341
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20220504134155.11832-2-lersek@redhat.com>
|
||||
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
(cherry picked from commit 3eb830dbaee12c8dc4566cab226ed2af0e0f2d8c)
|
||||
---
|
||||
generator/actions_core_deprecated.ml | 8 +++-
|
||||
lib/launch-direct.c | 59 ++++++----------------------
|
||||
2 files changed, 19 insertions(+), 48 deletions(-)
|
||||
|
||||
diff --git a/generator/actions_core_deprecated.ml b/generator/actions_core_deprecated.ml
|
||||
index 00dde3d2a..f1040a0e9 100644
|
||||
--- a/generator/actions_core_deprecated.ml
|
||||
+++ b/generator/actions_core_deprecated.ml
|
||||
@@ -73,7 +73,9 @@ of C<guestfs_add_drive_ro>." };
|
||||
shortdesc = "add a drive specifying the QEMU block emulation to use";
|
||||
longdesc = "\
|
||||
This is the same as C<guestfs_add_drive> but it allows you
|
||||
-to specify the QEMU interface emulation to use at run time." };
|
||||
+to specify the QEMU interface emulation to use at run time.
|
||||
+The libvirt backend rejects a non-empty C<iface> argument.
|
||||
+The direct backend ignores C<iface>." };
|
||||
|
||||
{ defaults with
|
||||
name = "add_drive_ro_with_if"; added = (1, 0, 84);
|
||||
@@ -83,7 +85,9 @@ to specify the QEMU interface emulation to use at run time." };
|
||||
shortdesc = "add a drive read-only specifying the QEMU block emulation to use";
|
||||
longdesc = "\
|
||||
This is the same as C<guestfs_add_drive_ro> but it allows you
|
||||
-to specify the QEMU interface emulation to use at run time." };
|
||||
+to specify the QEMU interface emulation to use at run time.
|
||||
+The libvirt backend rejects a non-empty C<iface> argument.
|
||||
+The direct backend ignores C<iface>." };
|
||||
|
||||
{ defaults with
|
||||
name = "lstatlist"; added = (1, 0, 77);
|
||||
diff --git a/lib/launch-direct.c b/lib/launch-direct.c
|
||||
index b292b9c26..ff0eaeb62 100644
|
||||
--- a/lib/launch-direct.c
|
||||
+++ b/lib/launch-direct.c
|
||||
@@ -296,52 +296,19 @@ static int
|
||||
add_drive (guestfs_h *g, struct backend_direct_data *data,
|
||||
struct qemuopts *qopts, size_t i, struct drive *drv)
|
||||
{
|
||||
- /* If there's an explicit 'iface', use it. Otherwise default to
|
||||
- * virtio-scsi.
|
||||
- */
|
||||
- if (drv->iface && STREQ (drv->iface, "virtio")) { /* virtio-blk */
|
||||
- start_list ("-drive") {
|
||||
- if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
|
||||
- return -1;
|
||||
- append_list ("if=none");
|
||||
- } end_list ();
|
||||
- start_list ("-device") {
|
||||
- append_list (VIRTIO_DEVICE_NAME ("virtio-blk"));
|
||||
- append_list_format ("drive=hd%zu", i);
|
||||
- if (drv->disk_label)
|
||||
- append_list_format ("serial=%s", drv->disk_label);
|
||||
- if (add_device_blocksize_params (g, qopts, drv) == -1)
|
||||
- return -1;
|
||||
- } end_list ();
|
||||
- }
|
||||
-#if defined(__arm__) || defined(__aarch64__) || defined(__powerpc__)
|
||||
- else if (drv->iface && STREQ (drv->iface, "ide")) {
|
||||
- error (g, "'ide' interface does not work on ARM or PowerPC");
|
||||
- return -1;
|
||||
- }
|
||||
-#endif
|
||||
- else if (drv->iface) {
|
||||
- start_list ("-drive") {
|
||||
- if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
|
||||
- return -1;
|
||||
- append_list_format ("if=%s", drv->iface);
|
||||
- } end_list ();
|
||||
- }
|
||||
- else /* default case: virtio-scsi */ {
|
||||
- start_list ("-drive") {
|
||||
- if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
|
||||
- return -1;
|
||||
- append_list ("if=none");
|
||||
- } end_list ();
|
||||
- start_list ("-device") {
|
||||
- append_list ("scsi-hd");
|
||||
- append_list_format ("drive=hd%zu", i);
|
||||
- if (drv->disk_label)
|
||||
- append_list_format ("serial=%s", drv->disk_label);
|
||||
- if (add_device_blocksize_params (g, qopts, drv) == -1)
|
||||
- return -1;
|
||||
- } end_list ();
|
||||
- }
|
||||
+ start_list ("-drive") {
|
||||
+ if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
|
||||
+ return -1;
|
||||
+ append_list ("if=none");
|
||||
+ } end_list ();
|
||||
+ start_list ("-device") {
|
||||
+ append_list ("scsi-hd");
|
||||
+ append_list_format ("drive=hd%zu", i);
|
||||
+ if (drv->disk_label)
|
||||
+ append_list_format ("serial=%s", drv->disk_label);
|
||||
+ if (add_device_blocksize_params (g, qopts, drv) == -1)
|
||||
+ return -1;
|
||||
+ } end_list ();
|
||||
|
||||
return 0;
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From dbd1eaab6a478cf0c3ea093a56b3d04c29278615 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 12 Jan 2021 10:23:11 +0000
|
||||
Subject: [PATCH] build: Avoid warnings about unknown pragmas.
|
||||
|
||||
In commit 4bbbf03b8bc266ed2b63c461cd0945250bb134fe we started to
|
||||
ignore bogus GCC 11 warnings. Unfortunately earlier versions of GCC
|
||||
don't know about those pragmas so give warnings [hence errors in
|
||||
developer builds] like:
|
||||
|
||||
tsk.c:75:32: error: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
|
||||
|
||||
Turn off these warnings.
|
||||
|
||||
Updates: commit 4bbbf03b8bc266ed2b63c461cd0945250bb134fe
|
||||
(cherry picked from commit 812f837c97f48ce0c26a0e02286fb9180c282923)
|
||||
---
|
||||
m4/guestfs-c.m4 | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4
|
||||
index 25ffea0d9..bbb4db464 100644
|
||||
--- a/m4/guestfs-c.m4
|
||||
+++ b/m4/guestfs-c.m4
|
||||
@@ -108,6 +108,9 @@ gl_WARN_ADD([-Wformat-truncation=1])
|
||||
dnl GCC 9 at level 2 gives apparently bogus errors when %.*s is used.
|
||||
gl_WARN_ADD([-Wformat-overflow=1])
|
||||
|
||||
+dnl GCC < 11 gives warnings when disabling GCC 11 warnings.
|
||||
+gl_WARN_ADD([-Wno-pragmas])
|
||||
+
|
||||
AC_SUBST([WARN_CFLAGS])
|
||||
|
||||
NO_SNV_CFLAGS=
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,82 @@
|
||||
From f408b24d8d8f5b5f4e1a25c1046c3a18107c8d80 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 4 May 2022 15:41:54 +0200
|
||||
Subject: [PATCH] lib: rename VALID_FORMAT_IFACE to VALID_FORMAT
|
||||
|
||||
We no longer use VALID_FORMAT_IFACE for validating "iface"; rename the
|
||||
macro to reflect that we only check "format" with it.
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844341
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20220504134155.11832-4-lersek@redhat.com>
|
||||
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
(cherry picked from commit c8e3caf9e6000ea2f5cfbe30ffe1240317bb4578)
|
||||
---
|
||||
lib/drives.c | 4 ++--
|
||||
lib/unit-tests.c | 16 ++++++++--------
|
||||
2 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/lib/drives.c b/lib/drives.c
|
||||
index 8fe46a41c..c5a208468 100644
|
||||
--- a/lib/drives.c
|
||||
+++ b/lib/drives.c
|
||||
@@ -593,7 +593,7 @@ guestfs_int_free_drives (guestfs_h *g)
|
||||
* Check string parameter matches regular expression
|
||||
* C<^[-_[:alnum:]]+$> (in C locale).
|
||||
*/
|
||||
-#define VALID_FORMAT_IFACE(str) \
|
||||
+#define VALID_FORMAT(str) \
|
||||
guestfs_int_string_is_valid ((str), 1, 0, \
|
||||
VALID_FLAG_ALPHA|VALID_FLAG_DIGIT, "-_")
|
||||
|
||||
@@ -790,7 +790,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
|
||||
return -1;
|
||||
}
|
||||
|
||||
- if (data.format && !VALID_FORMAT_IFACE (data.format)) {
|
||||
+ if (data.format && !VALID_FORMAT (data.format)) {
|
||||
error (g, _("%s parameter is empty or contains disallowed characters"),
|
||||
"format");
|
||||
free_drive_servers (data.servers, data.nr_servers);
|
||||
diff --git a/lib/unit-tests.c b/lib/unit-tests.c
|
||||
index 62457ccba..0e550cb98 100644
|
||||
--- a/lib/unit-tests.c
|
||||
+++ b/lib/unit-tests.c
|
||||
@@ -434,7 +434,7 @@ test_stringsbuf (void)
|
||||
}
|
||||
|
||||
/* Use the same macros as in lib/drives.c */
|
||||
-#define VALID_FORMAT_IFACE(str) \
|
||||
+#define VALID_FORMAT(str) \
|
||||
guestfs_int_string_is_valid ((str), 1, 0, \
|
||||
VALID_FLAG_ALPHA|VALID_FLAG_DIGIT, "-_")
|
||||
#define VALID_DISK_LABEL(str) \
|
||||
@@ -446,18 +446,18 @@ test_stringsbuf (void)
|
||||
static void
|
||||
test_valid (void)
|
||||
{
|
||||
- assert (!VALID_FORMAT_IFACE (""));
|
||||
+ assert (!VALID_FORMAT (""));
|
||||
assert (!VALID_DISK_LABEL (""));
|
||||
assert (!VALID_HOSTNAME (""));
|
||||
|
||||
assert (!VALID_DISK_LABEL ("012345678901234567890"));
|
||||
|
||||
- assert (VALID_FORMAT_IFACE ("abc"));
|
||||
- assert (VALID_FORMAT_IFACE ("ABC"));
|
||||
- assert (VALID_FORMAT_IFACE ("abc123"));
|
||||
- assert (VALID_FORMAT_IFACE ("abc123-"));
|
||||
- assert (VALID_FORMAT_IFACE ("abc123_"));
|
||||
- assert (!VALID_FORMAT_IFACE ("abc123."));
|
||||
+ assert (VALID_FORMAT ("abc"));
|
||||
+ assert (VALID_FORMAT ("ABC"));
|
||||
+ assert (VALID_FORMAT ("abc123"));
|
||||