qga: Add FreeBSD support
v2 cover qga: Add FreeBSD support
Add freeze/thaw, shutdown/halt/reboot and password setting support for FreeBSD.
v2:
1: Reject the idea to move all the Linux-specific code to a separate file.
First commit now adds initial support of FreeBSD. Fixed device paths and fixed virtio device initialization (disable echo). Add comment why we should disable the code under HAVE_GETIFADDRS in FreeBSD.
2: Replace the second commit (which now is the first) by moving
Linux-specific freeze/thaw code to a separate file commands-linux.c.
3: Add error raising if stat() returns error. Replaced strcmp() calls by
g_str_equal(). Add a comment explaining why UFSRESUME isn't necessary.
4: Replace #elifdef by #elif defined().
5: Now the code doesn't move from one file to aanother but still is
moving inside file so the patch doesn't become easier to review. =( Fixed typos.
6,7: New patches. Add guest-network-get-interfaces command support.
Alexander Ivanov (7):
qga: Add initial FreeBSD support
qga: Move Linux-specific FS freeze/thaw code to a separate file
qga: Add UFS freeze/thaw support for FreeBSD
qga: Add shutdown/halt/reboot support for FreeBSD
qga: Add support for user password setting in FreeBSD
qga: Move HW address getting to a separate function
qga: Add HW address getting for FreeBSD
meson.build | 2 +- qga/channel-posix.c | 14 + qga/commands-bsd.c | 193 ++++++++++ qga/commands-common.h | 52 +++ qga/commands-linux.c | 286 ++++++++++++++ qga/commands-posix.c | 843 ++++++++++++++++-------------------------- qga/main.c | 13 +- qga/meson.build | 6 + 8 files changed, 867 insertions(+), 542 deletions(-) create mode 100644 qga/commands-bsd.c create mode 100644 qga/commands-linux.c
Signature · 1 line
2.34.1
PATCH v2 1/7 qga: Add initial FreeBSD support
- Fix device path.
- Fix virtio-serial channel initialization.
- Make the code buildable in FreeBSD.
--- meson.build | 2 +- qga/channel-posix.c | 14 ++++++++++++++ qga/commands-posix.c | 8 ++++++++ qga/main.c | 6 +++++- 4 files changed, 28 insertions(+), 2 deletions(-)
meson.build +1 -1
@@ -75,7 +75,7 @@ have_tools = get_option('tools') \ .allowed() have_ga = get_option('guest_agent') \ .disable_auto_if(not have_system and not have_tools) \ - .require(targetos in ['sunos', 'linux', 'windows'], + .require(targetos in ['sunos', 'linux', 'windows', 'freebsd'], error_message: 'unsupported OS for QEMU guest agent') \ .allowed() have_block = have_system or have_tools
qga/channel-posix.c +14 -0
@@ -149,6 +149,20 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, return false; }#endif +#ifdef __FreeBSD__ +struct termios tio; +if (tcgetattr (fd, &tio) <0 ) { +error_setg_errno (errp, errno,"error getting channel termios attrs" ); +close (fd); +return false; + } + tio.c_lflag &= ~ECHO ; +if (tcsetattr (fd,TCSAFLUSH , &tio) <0 ) { +error_setg_errno (errp, errno,"error setting channel termios attrs" ); +close (fd); +return false; + } +#endif /* __FreeBSD__ */ ret =ga_channel_client_add (c, fd);if (ret) {error_setg (errp,"error adding channel to main loop" );
qga/commands-posix.c +8 -0
@@ -51,6 +51,14 @@#endif #endif +#ifdef __FreeBSD__ +/* +* The code under HAVE_GETIFADDRS condition can't be compiled in FreeBSD. +* Fix it in one of the following patches. +*/ +#undef HAVE_GETIFADDRS +#endif +#ifdef HAVE_GETIFADDRS #include <arpa/inet.h> #include <sys/socket.h>
qga/main.c +5 -1
@@ -45,9 +45,13 @@#endif #ifndef _WIN32 +#ifdef __FreeBSD__ +#define QGA_VIRTIO_PATH_DEFAULT "/dev/vtcon/org.qemu.guest_agent.0" +#else /* __FreeBSD__ */ #define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0" -#define QGA_STATE_RELATIVE_DIR "run" +#endif /* __FreeBSD__ */ #define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0" +#define QGA_STATE_RELATIVE_DIR "run"#else #define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0"#define QGA_STATE_RELATIVE_DIR "qemu-ga"
Signature · 1 line
2.34.1
Re: [PATCH 1/7] qga: Add initial FreeBSD support
Quoted 41 lines · Alexander Ivanov
- Fix device path.
- Fix virtio-serial channel initialization.
- Make the code buildable in FreeBSD.Signed-off-by Alexander Ivanov <[email protected]>--- meson.build | 2 +- qga/channel-posix.c | 14 ++++++++++++++ qga/commands-posix.c | 8 ++++++++ qga/main.c | 6 +++++- 4 files changed, 28 insertions(+), 2 deletions(-)meson.build +1
-1@@ -75,7 +75,7 @@ have_tools = get_option('tools') \ .allowed() have_ga = get_option('guest_agent') \ .disable_auto_if(not have_system and not have_tools) \ - .require(targetos in ['sunos', 'linux', 'windows'], + .require(targetos in ['sunos', 'linux', 'windows', 'freebsd'], error_message: 'unsupported OS for QEMU guest agent') \ .allowed() have_block = have_system or have_toolsqga/channel-posix.c +5
-0@@ -149,6 +149,20 @@ static gboolean ga_channel_open(GAChannel *c, constgchar *path, return false; }#endif +#ifdef __FreeBSD__ +struct termios tio; +if (tcgetattr (fd, &tio) <0 ) { +error_setg_errno (errp, errno,"error getting channel termios attrs"); +close (fd);
qga/channel-posix.c static gboolean ga_channel_open(GAChannel *c, const · line 168
Quoted 10 lines
qga/channel-posix.c +9
-0+return false; + } + tio.c_lflag &= ~ECHO ; +if (tcsetattr (fd,TCSAFLUSH , &tio) <0 ) { +error_setg_errno (errp, errno,"error setting channel termios attrs"); +close (fd); +return false; + } +#endif /* __FreeBSD__ */
It could help to document why this is needed. I assume this is correct, so:
Quoted 46 lines
ret = ga_channel_client_add(c, fd); if (ret) { error_setg(errp, "error adding channel to main loop");qga/commands-posix.c +8
-0@@ -51,6 +51,14 @@#endif #endif +#ifdef __FreeBSD__ +/* +* The code under HAVE_GETIFADDRS condition can't be compiled in FreeBSD. +* Fix it in one of the following patches. +*/ +#undef HAVE_GETIFADDRS +#endif +#ifdef HAVE_GETIFADDRS #include <arpa/inet.h> #include <sys/socket.h> qga/main.c +5
-2@@ -45,9 +45,13 @@#endif #ifndef _WIN32 +#ifdef __FreeBSD__ +#define QGA_VIRTIO_PATH_DEFAULT "/dev/vtcon/org.qemu.guest_agent.0" +#else /* __FreeBSD__ */ #define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0" -#define QGA_STATE_RELATIVE_DIR "run" +#endif /* __FreeBSD__ */ #define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0" +#define QGA_STATE_RELATIVE_DIR "run"#else #define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0"#define QGA_STATE_RELATIVE_DIR "qemu-ga" --2.34.1
Signature · 1 line
Marc-André Lureau
Re: [PATCH 1/7] qga: Add initial FreeBSD support
Hi Marc-André,
Thank you for the review.
Quoted 46 lines · Marc-André Lureau
On Thu, Sep 29, 2022 at 11:56 AM Alexander Ivanov <[email protected]> wrote:
- Fix device path. - Fix virtio-serial channel initialization. - Make the code buildable in FreeBSD. Signed-off-by: Alexander Ivanov <[email protected]> --- meson.build | 2 +- qga/channel-posix.c | 14 ++++++++++++++ qga/commands-posix.c | 8 ++++++++ qga/main.c | 6 +++++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8dc661363f..5c11abc8aa 100644 --- a/meson.build +++ b/meson.build @@ -75,7 +75,7 @@ have_tools = get_option('tools') \ .allowed() have_ga = get_option('guest_agent') \ .disable_auto_if(not have_system and not have_tools) \ - .require(targetos in ['sunos', 'linux', 'windows'], + .require(targetos in ['sunos', 'linux', 'windows', 'freebsd'], error_message: 'unsupported OS for QEMU guest agent') \ .allowed() have_block = have_system or have_tools diff --git a/qga/channel-posix.c b/qga/channel-posix.c index 6796a02cff..0f14246563 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -149,6 +149,20 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, return false; } #endif +#ifdef __FreeBSD__ + struct termios tio; + if (tcgetattr(fd, &tio) < 0) { + error_setg_errno(errp, errno, "error getting channel termios attrs"); + close(fd); + return false; + }
Quoted 9 lines
+ tio.c_lflag &= ~ECHO;
+ if (tcsetattr(fd, TCSAFLUSH, &tio) < 0) {
+ error_setg_errno(errp, errno, "error setting channel
termios attrs");
+ close(fd);
+ return false;
+ }
+#endif /* __FreeBSD__ */It is for echo suppressing. In other way a host client gets in return the commands it sends and raises an error. Will add a comment.
Quoted 58 lines
It could help to document why this is needed. I assume this is correct, so:
ret = ga_channel_client_add(c, fd); if (ret) { error_setg(errp, "error adding channel to main loop"); diff --git a/qga/commands-posix.c b/qga/commands-posix.c index eea819cff0..16d67e9f6d 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -51,6 +51,14 @@ #endif #endif +#ifdef __FreeBSD__ +/* + * The code under HAVE_GETIFADDRS condition can't be compiled in FreeBSD. + * Fix it in one of the following patches. + */ +#undef HAVE_GETIFADDRS +#endif + #ifdef HAVE_GETIFADDRS #include <arpa/inet.h> #include <sys/socket.h> diff --git a/qga/main.c b/qga/main.c index 5a9d8252e0..0d27c97d38 100644 --- a/qga/main.c +++ b/qga/main.c @@ -45,9 +45,13 @@ #endif #ifndef _WIN32 +#ifdef __FreeBSD__ +#define QGA_VIRTIO_PATH_DEFAULT "/dev/vtcon/org.qemu.guest_agent.0" +#else /* __FreeBSD__ */ #define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0" -#define QGA_STATE_RELATIVE_DIR "run" +#endif /* __FreeBSD__ */ #define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0" +#define QGA_STATE_RELATIVE_DIR "run" #else #define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0" #define QGA_STATE_RELATIVE_DIR "qemu-ga" -- 2.34.1Signature · 1 line
Marc-André Lureau
PATCH v2 2/7 qga: Move Linux-specific FS freeze/thaw code to a separate file
In reply to Alexander IvanovIn the next patches we are going to add FreeBSD support for QEMU Guest Agent. In the result, code in commands-posix.c will be too cumbersome.
Move Linux-specific FS freeze/thaw code to a separate file commands-linux.c keeping common POSIX code in commands-posix.c.
--- qga/commands-common.h | 35 +++++ qga/commands-linux.c | 286 +++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 289 +++--------------------------------------- qga/meson.build | 3 + 4 files changed, 340 insertions(+), 273 deletions(-) create mode 100644 qga/commands-linux.c
qga/commands-common.h +35 -0
@@ -10,6 +10,40 @@#define QGA_COMMANDS_COMMON_H #include "qga-qapi-types.h" +#include "guest-agent-core.h" +#include "qemu/queue.h" + +#if defined(__linux__) +#include <linux/fs.h> +#ifdef FIFREEZE +#define CONFIG_FSFREEZE +#endif +#ifdef FITRIM +#define CONFIG_FSTRIM +#endif +#endif /* __linux__ */ + +#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) +typedef struct FsMount { +char *dirname; +char *devtype; +unsigned int devmajor, devminor; +QTAILQ_ENTRY (FsMount) next; +}FsMount ; + +typedef QTAILQ_HEAD(FsMountList, FsMount) FsMountList; + +bool build_fs_mount_list (FsMountList *mounts,Error **errp); +void free_fs_mount_list (FsMountList *mounts); +#endif /* CONFIG_FSFREEZE || CONFIG_FSTRIM */ + +#if defined(CONFIG_FSFREEZE ) +int64_t qmp_guest_fsfreeze_do_freeze_list (bool has_mountpoints, +strList *mountpoints, +FsMountList mounts, +Error **errp); +int qmp_guest_fsfreeze_do_thaw (Error **errp); +#endif /* CONFIG_FSFREEZE */ typedef struct GuestFileHandle GuestFileHandle ;
@@ -29,4 +63,5 @@ GuestFileRead *guest_file_read_unsafe(GuestFileHandle *gfh,*/ char *qga_get_host_name (Error **errp); +void ga_wait_child (pid_t pid,int *status,Error **errp);#endif
qga/commands-linux.c new file +286 -0
286 lines not on this page · raw message
qga/commands-posix.c +16 -273
349 lines not on this page · raw message
qga/meson.build +3 -0
@@ -72,6 +72,9 @@ qga_ss.add(when: 'CONFIG_POSIX', if_true: files( 'commands-posix.c', 'commands-posix-ssh.c', )) +qga_ss.add(when: 'CONFIG_LINUX', if_true: files( + 'commands-linux.c', +)) qga_ss.add(when: 'CONFIG_WIN32', if_true: files( 'channel-win32.c', 'commands-win32.c',
Signature · 1 line
2.34.1
Re: [PATCH 2/7] qga: Move Linux-specific FS freeze/thaw code to a separate file
Quoted 8 lines · Alexander Ivanov
In the next patches we are going to add FreeBSD support for QEMU Guest Agent. In the result, code in
commands-posix.cwill be too cumbersome.Move Linux-specific FS freeze/thaw code to a separate file
commands-linux.ckeeping common POSIX code incommands-posix.c.Signed-off-by Alexander Ivanov <[email protected]>
lgtm,
Quoted 769 lines
--- qga/commands-common.h | 35 +++++ qga/commands-linux.c | 286 +++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 289 +++--------------------------------------- qga/meson.build | 3 + 4 files changed, 340 insertions(+), 273 deletions(-) create mode 100644 qga/commands-linux.cqga/commands-common.h +35
-0@@ -10,6 +10,40 @@#define QGA_COMMANDS_COMMON_H #include "qga-qapi-types.h" +#include "guest-agent-core.h" +#include "qemu/queue.h" + +#if defined(__linux__) +#include <linux/fs.h> +#ifdef FIFREEZE +#define CONFIG_FSFREEZE +#endif +#ifdef FITRIM +#define CONFIG_FSTRIM +#endif +#endif /* __linux__ */ + +#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) +typedef struct FsMount { +char *dirname; +char *devtype; +unsigned int devmajor, devminor; +QTAILQ_ENTRY (FsMount) next; +}FsMount ; + +typedef QTAILQ_HEAD(FsMountList, FsMount) FsMountList; + +bool build_fs_mount_list (FsMountList *mounts,Error **errp); +void free_fs_mount_list (FsMountList *mounts); +#endif /* CONFIG_FSFREEZE || CONFIG_FSTRIM */ + +#if defined(CONFIG_FSFREEZE ) +int64_t qmp_guest_fsfreeze_do_freeze_list (bool has_mountpoints, +strList *mountpoints, +FsMountList mounts, +Error **errp); +int qmp_guest_fsfreeze_do_thaw (Error **errp); +#endif /* CONFIG_FSFREEZE */ typedef struct GuestFileHandle GuestFileHandle ;@@ -29,4 +63,5 @@ GuestFileRead *guest_file_read_unsafe(GuestFileHandle*gfh, */ char *qga_get_host_name (Error **errp); +void ga_wait_child (pid_t pid,int *status,Error **errp);#endif
qga/commands-linux.c new file +10
-0@@ -0,0 +1,286 @@ +/* +* QEMU Guest Agent Linux-specific command implementations +* +* Copyright IBM Corp. 2011 +* +* Authors: +* Michael Roth <[email protected]> +* Michal Privoznik <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */qga/commands-linux.c new file +19
-0+ +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "commands-common.h" +#include "cutils.h" +#include <mntent.h> +#include <sys/ioctl.h> + +#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) +static int dev_major_minor (const char *devpath, +unsigned int *devmajor,unsigned int *devminor) +{ +struct stat st; + + *devmajor =0 ; + *devminor =0 ; + +if (stat (devpath, &st) <0 ) { + slog("failed to stat device file '%s': %s", devpath,strerror(errno));
qga/commands-linux.c new file +15
-0+return -1 ; + } +if (S_ISDIR (st.st_mode)) { +/* It is bind mount */ +return -2 ; + } +if (S_ISBLK (st.st_mode)) { + *devmajor =major (st.st_rdev); + *devminor =minor (st.st_rdev); +return 0 ; + } +return -1 ; +} + +static bool build_fs_mount_list_from_mtab(FsMountList *mounts, Error**errp)
qga/commands-linux.c new file +130
-1+{ +struct mntent *ment; +FsMount *mount; +char const *mtab ="/proc/self/mounts" ; +FILE *fp; +unsigned int devmajor, devminor; + + fp =setmntent (mtab,"r" ); +if (!fp) { +error_setg (errp,"failed to open mtab file: '%s'" , mtab); +return false; + } + +while ((ment =getmntent (fp))) { +/* +* An entry which device name doesn't start with a '/' is +* either a dummy file system or a network file system. +* Add special handling for smbfs and cifs as is done by +* coreutils as well. +*/ +if ((ment->mnt_fsname[0 ] !='/' ) || + (strcmp (ment->mnt_type,"smbfs" ) ==0 ) || + (strcmp (ment->mnt_type,"cifs" ) ==0 )) { +continue ; + } +if (dev_major_minor (ment->mnt_fsname, &devmajor, &devminor) == -2) { +/* Skip bind mounts */ + continue; + } + + mount =g_new0 (FsMount,1 ); + mount->dirname =g_strdup (ment->mnt_dir); + mount->devtype =g_strdup (ment->mnt_type); + mount->devmajor = devmajor; + mount->devminor = devminor; + +QTAILQ_INSERT_TAIL (mounts, mount, next); + } + +endmntent (fp); +return true; +} + +static void decode_mntname (char *name,int len) +{ +int i, j =0 ; +for (i =0 ; i <= len; i++) { +if (name[i] !='\\' ) { + name[j++] = name[i]; + }else if (name[i +1 ] =='\\' ) { + name[j++] ='\\' ; + i++; + }else if (name[i +1 ] >='0' && name[i +1 ] <='3' && + name[i +2 ] >='0' && name[i +2 ] <='7' && + name[i +3 ] >='0' && name[i +3 ] <='7' ) { + name[j++] = (name[i +1 ] -'0' ) *64 + + (name[i +2 ] -'0' ) *8 + + (name[i +3 ] -'0' ); + i +=3 ; + }else { + name[j++] = name[i]; + } + } +} + +/* +* Walk the mount table and build a list of local file systems +*/ +bool build_fs_mount_list (FsMountList *mounts,Error **errp) +{ +FsMount *mount; +char const *mountinfo ="/proc/self/mountinfo" ; +FILE *fp; +char *line =NULL , *dash; +size_t n; +char check; +unsigned int devmajor, devminor; +int ret, dir_s, dir_e, type_s, type_e, dev_s, dev_e; + + fp =fopen (mountinfo,"r" ); +if (!fp) { +return build_fs_mount_list_from_mtab (mounts, errp); + } + +while (getline (&line, &n, fp) !=-1 ) { + ret =sscanf (line,"%*u %*u %u:%u %*s %n%*s%n%c" , + &devmajor, &devminor, &dir_s, &dir_e, &check); +if (ret <3 ) { +continue ; + } + dash =strstr (line + dir_e," - " ); +if (!dash) { +continue ; + } + ret =sscanf (dash," - %n%*s%n %n%*s%n%c" , + &type_s, &type_e, &dev_s, &dev_e, &check); +if (ret <1 ) { +continue ; + } + line[dir_e] =0 ; + dash[type_e] =0 ; + dash[dev_e] =0 ; +decode_mntname (line + dir_s, dir_e - dir_s); +decode_mntname (dash + dev_s, dev_e - dev_s); +if (devmajor ==0 ) { +/* btrfs reports major number = 0 */ +if (strcmp ("btrfs" , dash + type_s) !=0 || +dev_major_minor (dash + dev_s, &devmajor, &devminor) <0 ) { +continue ; + } + } + + mount =g_new0 (FsMount,1 ); + mount->dirname =g_strdup (line + dir_s); + mount->devtype =g_strdup (dash + type_s); + mount->devmajor = devmajor; + mount->devminor = devminor; + +QTAILQ_INSERT_TAIL (mounts, mount, next); + } +free (line); + +fclose (fp); +return true; +} +#endif /* CONFIG_FSFREEZE || CONFIG_FSTRIM */ + +#ifdef CONFIG_FSFREEZE +/* +* Walk list of mounted file systems in the guest, and freeze the ones which
+ * are real local file systems.
+ */qga/commands-linux.c new file +26
-0+int64_t qmp_guest_fsfreeze_do_freeze_list (bool has_mountpoints, +strList *mountpoints, +FsMountList mounts, +Error **errp) +{ +struct FsMount *mount; +strList *list; +int fd, ret, i =0 ; + + QTAILQ_FOREACH_REVERSE(mount, &mounts, next) { +/* To issue fsfreeze in the reverse order of mounts, check if the +* mount is listed in the list here */ +if (has_mountpoints) { +for (list = mountpoints; list; list = list->next) { +if (strcmp (list->value, mount->dirname) ==0 ) { +break ; + } + } +if (!list) { +continue ; + } + } + + fd =qga_open_cloexec (mount->dirname,O_RDONLY ,0 ); +if (fd ==-1 ) { + error_setg_errno(errp, errno, "failed to open %s",
mount->dirname);qga/commands-linux.c new file +4
-0+return -1 ; + } + +/* we try to cull filesystems we know won't work in advance, but other
+ * filesystems may not implement fsfreeze for less obvious
reasons.
+ * these will report EOPNOTSUPP. we simply ignore these when
tallyingqga/commands-linux.c new file +46
-0+* the number of frozen filesystems. +* if a filesystem is mounted more than once (aka bind mount) a +* consecutive attempt to freeze an already frozen filesystem will +* return EBUSY. +* +* any other error means a failure to freeze a filesystem we +* expect to be freezable, so return an error in those cases +* and return system to thawed state. +*/ + ret =ioctl (fd,FIFREEZE ); +if (ret ==-1 ) { +if (errno !=EOPNOTSUPP && errno !=EBUSY ) { +error_setg_errno (errp, errno,"failed to freeze %s" , + mount->dirname); +close (fd); +return -1 ; + } + }else { + i++; + } +close (fd); + } +return i; +} + +int qmp_guest_fsfreeze_do_thaw (Error **errp) +{ +int ret; +FsMountList mounts; +FsMount *mount; +int fd, i =0 , logged; +Error *local_err =NULL ; + +QTAILQ_INIT (&mounts); +if (!build_fs_mount_list (&mounts, &local_err)) { +error_propagate (errp, local_err); +return -1 ; + } + + QTAILQ_FOREACH(mount, &mounts, next) { + logged = false; + fd =qga_open_cloexec (mount->dirname,O_RDONLY ,0 ); +if (fd ==-1 ) { +continue ; + } +/* we have no way of knowing whether a filesystem was actually unfrozen
+ * as a result of a successful call to FITHAW, only that if an
error
+ * was returned the filesystem was *not* unfrozen by that
particularqga/commands-linux.c new file +3
-0+* call. +* +* since multiple preceding FIFREEZEs require multiple calls to FITHAW
+ * to unfreeze, continuing issuing FITHAW until an error is
returned,
+ * in which case either the filesystem is in an unfreezable
state, or,
+ * more likely, it was thawed previously (and remains so
afterward).qga/commands-linux.c new file +3
-0+* +* also, since the most recent successful call is the one that did +* the actual unfreeze, we can use this to provide an accurate count
+ * of the number of filesystems unfrozen by guest-fsfreeze-thaw,
which
+ * may * be useful for determining whether a filesystem was
unfrozenqga/commands-linux.c new file +17
-0+* during the freeze/thaw phase by a process other than qemu-ga. +*/ +do { + ret =ioctl (fd,FITHAW ); +if (ret ==0 && !logged) { + i++; + logged = true; + } + }while (ret ==0 ); + close(fd); + } + +free_fs_mount_list (&mounts); + +return i; +} +#endif /* CONFIG_FSFREEZE */ qga/commands-posix.c +2
-167@@ -16,11 +16,9 @@#include <sys/utsname.h> #include <sys/wait.h> #include <dirent.h> -#include "guest-agent-core.h" #include "qga-qapi-commands.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qemu/queue.h" #include "qemu/host-utils.h" #include "qemu/sockets.h" #include "qemu/base64.h" @@ -70,7 +68,7 @@#endif #endif -static void ga_wait_child (pid_t pid,int *status,Error **errp) +void ga_wait_child (pid_t pid,int *status,Error **errp) {pid_t rpid;@@ -629,16 +627,7 @@ void qmp_guest_file_flush(int64_t handle, Error **errp) #if defined(__linux__) #if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM) -typedef struct FsMount { - char *dirname; - char *devtype; - unsigned int devmajor, devminor; - QTAILQ_ENTRY(FsMount) next; -} FsMount; - -typedef QTAILQ_HEAD(FsMountList, FsMount) FsMountList; - -static void free_fs_mount_list(FsMountList *mounts) +void free_fs_mount_list(FsMountList *mounts) { FsMount *mount, *temp;@@ -653,157 +642,6 @@ static void free_fs_mount_list(FsMountList *mounts) g_free(mount); } } - -static int dev_major_minor (const char *devpath, -unsigned int *devmajor,unsigned int *devminor) -{ -struct stat st; - - *devmajor =0 ; - *devminor =0 ; - -if (stat (devpath, &st) <0 ) { -slog ("failed to stat device file '%s': %s" , devpath, strerror(errno)); -return -1 ; - } -if (S_ISDIR (st.st_mode)) { -/* It is bind mount */ -return -2 ; - } -if (S_ISBLK (st.st_mode)) { - *devmajor =major (st.st_rdev); - *devminor =minor (st.st_rdev); -return 0 ; - } -return -1 ; -} - -/* -* Walk the mount table and build a list of local file systems -*/ -static bool build_fs_mount_list_from_mtab (FsMountList *mounts,Error **errp) -{ -struct mntent *ment; -FsMount *mount; -char const *mtab ="/proc/self/mounts" ; -FILE *fp; -unsigned int devmajor, devminor; - - fp =setmntent (mtab,"r" ); -if (!fp) { -error_setg (errp,"failed to open mtab file: '%s'" , mtab); -return false; - } - -while ((ment =getmntent (fp))) { -/* -* An entry which device name doesn't start with a '/' is -* either a dummy file system or a network file system. -* Add special handling for smbfs and cifs as is done by -* coreutils as well. -*/ -if ((ment->mnt_fsname[0 ] !='/' ) || - (strcmp (ment->mnt_type,"smbfs" ) ==0 ) || - (strcmp (ment->mnt_type,"cifs" ) ==0 )) { -continue ; - } -if (dev_major_minor (ment->mnt_fsname, &devmajor, &devminor) == -2 ) { -/* Skip bind mounts */ -continue ; - } - - mount =g_new0 (FsMount,1 ); - mount->dirname =g_strdup (ment->mnt_dir); - mount->devtype =g_strdup (ment->mnt_type); - mount->devmajor = devmajor; - mount->devminor = devminor; - -QTAILQ_INSERT_TAIL (mounts, mount, next); - } - -endmntent (fp); -return true; -} - -static void decode_mntname (char *name,int len) -{ -int i, j =0 ; -for (i =0 ; i <= len; i++) { -if (name[i] !='\\' ) { - name[j++] = name[i]; - }else if (name[i +1 ] =='\\' ) { - name[j++] ='\\' ; - i++; - }else if (name[i +1 ] >='0' && name[i +1 ] <='3' && - name[i +2 ] >='0' && name[i +2 ] <='7' && - name[i +3 ] >='0' && name[i +3 ] <='7' ) { - name[j++] = (name[i +1 ] -'0' ) *64 + - (name[i +2 ] -'0' ) *8 + - (name[i +3 ] -'0' ); - i +=3 ; - }else { - name[j++] = name[i]; - } - } -} - -static bool build_fs_mount_list (FsMountList *mounts,Error **errp) -{ -FsMount *mount; -char const *mountinfo ="/proc/self/mountinfo" ; -FILE *fp; -char *line =NULL , *dash; -size_t n; -char check; -unsigned int devmajor, devminor; -int ret, dir_s, dir_e, type_s, type_e, dev_s, dev_e; - - fp =fopen (mountinfo,"r" ); -if (!fp) { -return build_fs_mount_list_from_mtab (mounts, errp); - } - -while (getline (&line, &n, fp) !=-1 ) { - ret =sscanf (line,"%*u %*u %u:%u %*s %n%*s%n%c" , - &devmajor, &devminor, &dir_s, &dir_e, &check); -if (ret <3 ) { -continue ; - } - dash =strstr (line + dir_e," - " ); -if (!dash) { -continue ; - } - ret =sscanf (dash," - %n%*s%n %n%*s%n%c" , - &type_s, &type_e, &dev_s, &dev_e, &check); -if (ret <1 ) { -continue ; - } - line[dir_e] =0 ; - dash[type_e] =0 ; - dash[dev_e] =0 ; -decode_mntname (line + dir_s, dir_e - dir_s); -decode_mntname (dash + dev_s, dev_e - dev_s); -if (devmajor ==0 ) { -/* btrfs reports major number = 0 */ -if (strcmp ("btrfs" , dash + type_s) !=0 || -dev_major_minor (dash + dev_s, &devmajor, &devminor) <0 ) { -continue ; - } - } - - mount =g_new0 (FsMount,1 ); - mount->dirname =g_strdup (line + dir_s); - mount->devtype =g_strdup (dash + type_s); - mount->devmajor = devmajor; - mount->devminor = devminor; - -QTAILQ_INSERT_TAIL (mounts, mount, next); - } -free (line); - -fclose (fp); -return true; -} #endif#if defined(CONFIG_FSFREEZE )@@ -1708,20 +1546,13 @@ int64_t qmp_guest_fsfreeze_freeze(Error **errp)return qmp_guest_fsfreeze_freeze_list (false,NULL , errp); } -/* -* Walk list of mounted file systems in the guest, and freeze the ones which
- * are real local file systems.
- */
int64_tqmp_guest_fsfreeze_freeze_list(boolhas_mountpoints,
strList *mountpoints, Error **errp)
{qga/commands-posix.c +1
-25-int ret =0 , i =0 ; -strList *list; +int ret;FsMountList mounts; -struct FsMount *mount;Error *local_err =NULL ; -int fd;slog ("guest-fsfreeze called" );@@ -1740,122 +1571,34 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool has_mountpoints,/* cannot risk guest agent blocking itself on a write in this state */ ga_set_frozen (ga_state); - QTAILQ_FOREACH_REVERSE(mount, &mounts, next) { -/* To issue fsfreeze in the reverse order of mounts, check if the -* mount is listed in the list here */ -if (has_mountpoints) { -for (list = mountpoints; list; list = list->next) { -if (strcmp (list->value, mount->dirname) ==0 ) { -break ; - } - } -if (!list) { -continue ; - } - } - - fd =qga_open_cloexec (mount->dirname,O_RDONLY ,0 ); -if (fd ==-1 ) { -error_setg_errno (errp, errno,"failed to open %s" , mount->dirname); - goto error; - } - -/* we try to cull filesystems we know won't work in advance, but other
- * filesystems may not implement fsfreeze for less obvious
reasons.
- * these will report EOPNOTSUPP. we simply ignore these when
tallyingqga/commands-posix.c +12
-47-* the number of frozen filesystems. -* if a filesystem is mounted more than once (aka bind mount) a -* consecutive attempt to freeze an already frozen filesystem will -* return EBUSY. -* -* any other error means a failure to freeze a filesystem we -* expect to be freezable, so return an error in those cases -* and return system to thawed state. -*/ - ret =ioctl (fd,FIFREEZE ); -if (ret ==-1 ) { -if (errno !=EOPNOTSUPP && errno !=EBUSY ) { -error_setg_errno (errp, errno,"failed to freeze %s" , - mount->dirname); -close (fd); - goto error; - } - }else { - i++; - } -close (fd); - } + ret =qmp_guest_fsfreeze_do_freeze_list (has_mountpoints, mountpoints, + mounts, errp);free_fs_mount_list (&mounts);/* We may not issue any FIFREEZE here. * Just unset ga_state here and ready for the next call. */ -if (i ==0 ) { +if (ret ==0 ) {ga_unset_frozen (ga_state); + }else if (ret <0 ) { +qmp_guest_fsfreeze_thaw (NULL ); } -return i; - -error: -free_fs_mount_list (&mounts); -qmp_guest_fsfreeze_thaw (NULL ); -return 0 ; +return ret; } -/* -* Walk list of frozen file systems in the guest, and thaw them. -*/ int64_t qmp_guest_fsfreeze_thaw (Error **errp) {int ret; -FsMountList mounts; -FsMount *mount; -int fd, i =0 , logged; -Error *local_err =NULL ; -QTAILQ_INIT (&mounts); -if (!build_fs_mount_list (&mounts, &local_err)) { -error_propagate (errp, local_err); -return 0 ; + ret =qmp_guest_fsfreeze_do_thaw (errp); +if (ret >=0 ) { +ga_unset_frozen (ga_state); +execute_fsfreeze_hook (FSFREEZE_HOOK_THAW , errp); + }else { + ret =0 ; } - QTAILQ_FOREACH(mount, &mounts, next) { - logged = false; - fd =qga_open_cloexec (mount->dirname,O_RDONLY ,0 ); -if (fd ==-1 ) { -continue ; - } -/* we have no way of knowing whether a filesystem was actually unfrozen
- * as a result of a successful call to FITHAW, only that if an
error
- * was returned the filesystem was *not* unfrozen by that
particularqga/commands-posix.c +0
-3-* call. -* -* since multiple preceding FIFREEZEs require multiple calls to FITHAW
- * to unfreeze, continuing issuing FITHAW until an error is
returned,
- * in which case either the filesystem is in an unfreezable
state, or,
- * more likely, it was thawed previously (and remains so
afterward).qga/commands-posix.c +0
-3-* -* also, since the most recent successful call is the one that did -* the actual unfreeze, we can use this to provide an accurate count
- * of the number of filesystems unfrozen by guest-fsfreeze-thaw,
which
- * may * be useful for determining whether a filesystem was
unfrozenqga/commands-posix.c +1
-18-* during the freeze/thaw phase by a process other than qemu-ga. -*/ -do { - ret =ioctl (fd,FITHAW ); -if (ret ==0 && !logged) { - i++; - logged = true; - } - }while (ret ==0 ); -close (fd); - } - -ga_unset_frozen (ga_state); -free_fs_mount_list (&mounts); - -execute_fsfreeze_hook (FSFREEZE_HOOK_THAW , errp); - -return i; +return ret; }static void guest_fsfreeze_cleanup (void )qga/meson.build +3
-1@@ -72,6 +72,9 @@ qga_ss.add(when: 'CONFIG_POSIX', if_true: files( 'commands-posix.c', 'commands-posix-ssh.c', )) +qga_ss.add(when: 'CONFIG_LINUX', if_true: files( + 'commands-linux.c', +)) qga_ss.add(when: 'CONFIG_WIN32', if_true: files( 'channel-win32.c', 'commands-win32.c', --2.34.1
Signature · 1 line
Marc-André Lureau
PATCH v2 3/7 qga: Add UFS freeze/thaw support for FreeBSD
In reply to Alexander IvanovUFS supports FS freezing through ioctl UFSSUSPEND on /dev/ufssuspend. Frozen FS can be thawed by closing /dev/ufssuspend file descriptior.
Use getmntinfo to get a list of mounted FS.
--- qga/commands-bsd.c | 169 +++++++++++++++++++++++ qga/commands-common.h | 11 ++ qga/commands-posix.c | 308 ++++++++++++++++++++---------------------- qga/main.c | 7 +- qga/meson.build | 3 + 5 files changed, 334 insertions(+), 164 deletions(-) create mode 100644 qga/commands-bsd.c
qga/commands-bsd.c new file +169 -0
@@ -0,0 +1,169 @@ +/* +* QEMU Guest Agent BSD-specific command implementations +* +* Copyright (c) Virtuozzo International GmbH. +* +* Authors: +* Alexander Ivanov <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "qga-qapi-commands.h" +#include "qapi/qmp/qerror.h" +#include "qapi/error.h" +#include "qemu/queue.h" +#include "commands-common.h" +#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ucred.h> +#include <sys/mount.h> +#include <paths.h> + +#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) +bool build_fs_mount_list (FsMountList *mounts,Error **errp) +{ +FsMount *mount; +struct statfs *mntbuf, *mntp; +struct stat statbuf; +int i, count, ret; + + count =getmntinfo (&mntbuf,MNT_NOWAIT ); +if (count ==0 ) { +error_setg_errno (errp, errno,"getmntinfo failed" ); +return false; + } + +for (i =0 ; i < count; i++) { + mntp = &mntbuf[i]; + ret =stat (mntp->f_mntonname, &statbuf); +if (ret !=0 ) { +error_setg_errno (errp, errno,"stat failed on %s" , + mntp->f_mntonname); +return false; + } + + mount =g_new0 (FsMount,1 ); + + mount->dirname =g_strdup (mntp->f_mntonname); + mount->devtype =g_strdup (mntp->f_fstypename); + mount->devmajor =major (mount->dev); + mount->devminor =minor (mount->dev); + mount->fsid = mntp->f_fsid; + mount->dev = statbuf.st_dev; + +QTAILQ_INSERT_TAIL (mounts, mount, next); + } +return true; +} +#endif /* CONFIG_FSFREEZE || CONFIG_FSTRIM */ + +#if defined(CONFIG_FSFREEZE ) +static int ufssuspend_fd =-1 ; +static int ufssuspend_cnt; + +int64_t qmp_guest_fsfreeze_do_freeze_list (bool has_mountpoints, +strList *mountpoints, +FsMountList mounts, +Error **errp) +{ +int ret; +strList *list; +struct FsMount *mount; + +if (ufssuspend_fd !=-1 ) { +error_setg (errp,"filesystems have already frozen" ); +return -1 ; + } + + ufssuspend_cnt =0 ; + ufssuspend_fd =qemu_open (_PATH_UFSSUSPEND,O_RDWR , errp); +if (ufssuspend_fd ==-1 ) { +return -1 ; + } + + QTAILQ_FOREACH_REVERSE(mount, &mounts, next) { +/* +* To issue fsfreeze in the reverse order of mounts, check if the +* mount is listed in the list here +*/ +if (has_mountpoints) { +for (list = mountpoints; list; list = list->next) { +if (g_str_equal (list->value, mount->dirname)) { +break ; + } + } +if (!list) { +continue ; + } + } + +/* Only UFS supports suspend */ +if (!g_str_equal (mount->devtype,"ufs" )) { +continue ; + } + + ret =ioctl (ufssuspend_fd,UFSSUSPEND , &mount->fsid); +if (ret ==-1 ) { +/* +* ioctl returns EBUSY for all the FS except the first one +* that was suspended +*/ +if (errno ==EBUSY ) { +continue ; + } +error_setg_errno (errp, errno,"failed to freeze %s" , + mount->dirname); + goto error; + } + ufssuspend_cnt++; + } +return ufssuspend_cnt; +error: +close (ufssuspend_fd); + ufssuspend_fd =-1 ; +return -1 ; + +} + +/* +* We don't need to call UFSRESUME ioctl because all the frozen FS +* are thawed on /dev/ufssuspend closing. +*/ +int qmp_guest_fsfreeze_do_thaw (Error **errp) +{ +int ret = ufssuspend_cnt; + ufssuspend_cnt =0 ; +if (ufssuspend_fd !=-1 ) { +close (ufssuspend_fd); + ufssuspend_fd =-1 ; + } +return ret; +} + +GuestFilesystemInfoList *qmp_guest_get_fsinfo (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +GuestDiskInfoList *qmp_guest_get_disks (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +GuestDiskStatsInfoList *qmp_guest_get_diskstats (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +GuestCpuStatsList *qmp_guest_get_cpustats (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} +#endif /* CONFIG_FSFREEZE */
qga/commands-common.h +11 -0
@@ -23,11 +23,22 @@#endif #endif /* __linux__ */ +#ifdef __FreeBSD__ +#include <ufs/ffs/fs.h> +#ifdef UFSSUSPEND +#define CONFIG_FSFREEZE +#endif +#endif /* __FreeBSD__ */ +#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM )typedef struct FsMount {char *dirname;char *devtype;unsigned int devmajor, devminor; +#if defined(__FreeBSD__) +dev_t dev; +fsid_t fsid; +#endif QTAILQ_ENTRY (FsMount) next; }FsMount ;
qga/commands-posix.c +150 -158
338 lines not on this page · raw message
qga/main.c +1 -6
@@ -37,12 +37,7 @@#include "qga/service-win32.h" #include "qga/vss-win32.h" #endif -#ifdef __linux__ -#include <linux/fs.h> -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#endif +#include "commands-common.h" #ifndef _WIN32#ifdef __FreeBSD__
qga/meson.build +3 -0
@@ -75,6 +75,9 @@ qga_ss.add(when: 'CONFIG_POSIX', if_true: files( qga_ss.add(when: 'CONFIG_LINUX', if_true: files( 'commands-linux.c', )) +qga_ss.add(when: 'CONFIG_BSD', if_true: files( + 'commands-bsd.c', +)) qga_ss.add(when: 'CONFIG_WIN32', if_true: files( 'channel-win32.c', 'commands-win32.c',
Signature · 1 line
2.34.1
Re: [PATCH 3/7] qga: Add UFS freeze/thaw support for FreeBSD
Quoted 7 lines · Alexander Ivanov
UFS supports FS freezing through ioctl UFSSUSPEND on
/dev/ufssuspend. Frozen FS can be thawed by closing/dev/ufssuspendfile descriptior.Use getmntinfo to get a list of mounted FS.
Signed-off-by Alexander Ivanov <[email protected]>
lgtm,
Quoted 601 lines
--- qga/commands-bsd.c | 169 +++++++++++++++++++++++ qga/commands-common.h | 11 ++ qga/commands-posix.c | 308 ++++++++++++++++++++---------------------- qga/main.c | 7 +- qga/meson.build | 3 + 5 files changed, 334 insertions(+), 164 deletions(-) create mode 100644 qga/commands-bsd.cqga/commands-bsd.c new file +9
-0@@ -0,0 +1,169 @@ +/* +* QEMU Guest Agent BSD-specific command implementations +* +* Copyright (c) Virtuozzo International GmbH. +* +* Authors: +* Alexander Ivanov <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */qga/commands-bsd.c new file +158
-0+ +#include "qemu/osdep.h" +#include "qga-qapi-commands.h" +#include "qapi/qmp/qerror.h" +#include "qapi/error.h" +#include "qemu/queue.h" +#include "commands-common.h" +#include <sys/ioctl.h> +#include <sys/param.h> +#include <sys/ucred.h> +#include <sys/mount.h> +#include <paths.h> + +#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM ) +bool build_fs_mount_list (FsMountList *mounts,Error **errp) +{ +FsMount *mount; +struct statfs *mntbuf, *mntp; +struct stat statbuf; +int i, count, ret; + + count =getmntinfo (&mntbuf,MNT_NOWAIT ); +if (count ==0 ) { +error_setg_errno (errp, errno,"getmntinfo failed" ); +return false; + } + +for (i =0 ; i < count; i++) { + mntp = &mntbuf[i]; + ret =stat (mntp->f_mntonname, &statbuf); +if (ret !=0 ) { +error_setg_errno (errp, errno,"stat failed on %s" , + mntp->f_mntonname); +return false; + } + + mount =g_new0 (FsMount,1 ); + + mount->dirname =g_strdup (mntp->f_mntonname); + mount->devtype =g_strdup (mntp->f_fstypename); + mount->devmajor =major (mount->dev); + mount->devminor =minor (mount->dev); + mount->fsid = mntp->f_fsid; + mount->dev = statbuf.st_dev; + +QTAILQ_INSERT_TAIL (mounts, mount, next); + } +return true; +} +#endif /* CONFIG_FSFREEZE || CONFIG_FSTRIM */ + +#if defined(CONFIG_FSFREEZE ) +static int ufssuspend_fd =-1 ; +static int ufssuspend_cnt; + +int64_t qmp_guest_fsfreeze_do_freeze_list (bool has_mountpoints, +strList *mountpoints, +FsMountList mounts, +Error **errp) +{ +int ret; +strList *list; +struct FsMount *mount; + +if (ufssuspend_fd !=-1 ) { +error_setg (errp,"filesystems have already frozen" ); +return -1 ; + } + + ufssuspend_cnt =0 ; + ufssuspend_fd =qemu_open (_PATH_UFSSUSPEND,O_RDWR , errp); +if (ufssuspend_fd ==-1 ) { +return -1 ; + } + + QTAILQ_FOREACH_REVERSE(mount, &mounts, next) { +/* +* To issue fsfreeze in the reverse order of mounts, check if the +* mount is listed in the list here +*/ +if (has_mountpoints) { +for (list = mountpoints; list; list = list->next) { +if (g_str_equal (list->value, mount->dirname)) { +break ; + } + } +if (!list) { +continue ; + } + } + +/* Only UFS supports suspend */ +if (!g_str_equal (mount->devtype,"ufs" )) { +continue ; + } + + ret =ioctl (ufssuspend_fd,UFSSUSPEND , &mount->fsid); +if (ret ==-1 ) { +/* +* ioctl returns EBUSY for all the FS except the first one +* that was suspended +*/ +if (errno ==EBUSY ) { +continue ; + } +error_setg_errno (errp, errno,"failed to freeze %s" , + mount->dirname); + goto error; + } + ufssuspend_cnt++; + } +return ufssuspend_cnt; +error: +close (ufssuspend_fd); + ufssuspend_fd =-1 ; +return -1 ; + +} + +/* +* We don't need to call UFSRESUME ioctl because all the frozen FS +* are thawed on /dev/ufssuspend closing. +*/ +int qmp_guest_fsfreeze_do_thaw (Error **errp) +{ +int ret = ufssuspend_cnt; + ufssuspend_cnt =0 ; +if (ufssuspend_fd !=-1 ) { +close (ufssuspend_fd); + ufssuspend_fd =-1 ; + } +return ret; +} + +GuestFilesystemInfoList *qmp_guest_get_fsinfo (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +GuestDiskInfoList *qmp_guest_get_disks (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +GuestDiskStatsInfoList *qmp_guest_get_diskstats (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} + +GuestCpuStatsList *qmp_guest_get_cpustats (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} +#endif /* CONFIG_FSFREEZE */ qga/commands-common.h +11
-0@@ -23,11 +23,22 @@#endif #endif /* __linux__ */ +#ifdef __FreeBSD__ +#include <ufs/ffs/fs.h> +#ifdef UFSSUSPEND +#define CONFIG_FSFREEZE +#endif +#endif /* __FreeBSD__ */ +#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM )typedef struct FsMount {char *dirname;char *devtype;unsigned int devmajor, devminor; +#if defined(__FreeBSD__) +dev_t dev; +fsid_t fsid; +#endif QTAILQ_ENTRY (FsMount) next; }FsMount ;qga/commands-posix.c +150
-11@@ -33,20 +33,12 @@#if defined(__linux__)#include <mntent.h> -#include <linux/fs.h> #include <sys/statvfs.h> #include <linux/nvme_ioctl.h> #ifdef CONFIG_LIBUDEV #include <libudev.h> #endif - -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#ifdef FITRIM -#define CONFIG_FSTRIM -#endif #endif #ifdef __FreeBSD__@@ -623,9 +615,6 @@ void qmp_guest_file_flush(int64_t handle, Error **errp) } } -/* linux-specific implementations. avoid this if at all possible. */ -#if defined(__linux__) -#if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM )void free_fs_mount_list (FsMountList *mounts) {@@ -644,6 +633,156 @@ void free_fs_mount_list(FsMountList *mounts) }#endif +#if defined(CONFIG_FSFREEZE ) +typedef enum { +FSFREEZE_HOOK_THAW =0 , +FSFREEZE_HOOK_FREEZE , +}FsfreezeHookArg ; + +static const char *fsfreeze_hook_arg_string[] = { +"thaw" , +"freeze" , +}; + +static void execute_fsfreeze_hook (FsfreezeHookArg arg,Error **errp) +{ +int status; +pid_t pid; +const char *hook; +const char *arg_str = fsfreeze_hook_arg_string[arg]; +Error *local_err =NULL ; + + hook =ga_fsfreeze_hook (ga_state); +if (!hook) { +return ; + } +if (access (hook,X_OK ) !=0 ) { +error_setg_errno (errp, errno,"can't access fsfreeze hook '%s'" , hook); +return ; + } + +slog ("executing fsfreeze hook with arg '%s'" , arg_str); + pid =fork (); +if (pid ==0 ) { +setsid (); +reopen_fd_to_null (0 ); +reopen_fd_to_null (1 ); +reopen_fd_to_null (2 ); + +execl (hook, hook, arg_str,NULL ); +_exit (EXIT_FAILURE ); + }else if (pid <0 ) { +error_setg_errno (errp, errno,"failed to create child process" ); +return ; + } + +ga_wait_child (pid, &status, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +if (!WIFEXITED (status)) { +error_setg (errp,"fsfreeze hook has terminated abnormally" ); +return ; + } + + status =WEXITSTATUS (status); +if (status) { +error_setg (errp,"fsfreeze hook has failed with status %d" , status); +return ; + } +} + +/* +* Return status of freeze/thaw +*/ +GuestFsfreezeStatus qmp_guest_fsfreeze_status (Error **errp) +{ +if (ga_is_frozen (ga_state)) { +return GUEST_FSFREEZE_STATUS_FROZEN ; + } + +return GUEST_FSFREEZE_STATUS_THAWED ; +} + +int64_t qmp_guest_fsfreeze_freeze (Error **errp) +{ +return qmp_guest_fsfreeze_freeze_list (false,NULL , errp); +} + +int64_t qmp_guest_fsfreeze_freeze_list (bool has_mountpoints, +strList *mountpoints, +Error **errp) +{ +int ret; +FsMountList mounts; +Error *local_err =NULL ; + +slog ("guest-fsfreeze called" ); + +execute_fsfreeze_hook (FSFREEZE_HOOK_FREEZE , &local_err); +if (local_err) { +error_propagate (errp, local_err); +return -1 ; + } + +QTAILQ_INIT (&mounts); +if (!build_fs_mount_list (&mounts, &local_err)) { +error_propagate (errp, local_err); +return -1 ; + } + +/* cannot risk guest agent blocking itself on a write in this state */ +ga_set_frozen (ga_state); + + ret =qmp_guest_fsfreeze_do_freeze_list (has_mountpoints, mountpoints, + mounts, errp); + +free_fs_mount_list (&mounts); +/* We may not issue any FIFREEZE here. +* Just unset ga_state here and ready for the next call. +*/ +if (ret ==0 ) { +ga_unset_frozen (ga_state); + }else if (ret <0 ) { +qmp_guest_fsfreeze_thaw (NULL ); + } +return ret; +} + +int64_t qmp_guest_fsfreeze_thaw (Error **errp) +{ +int ret; + + ret =qmp_guest_fsfreeze_do_thaw (errp); +if (ret >=0 ) { +ga_unset_frozen (ga_state); +execute_fsfreeze_hook (FSFREEZE_HOOK_THAW , errp); + }else { + ret =0 ; + } + +return ret; +} + +static void guest_fsfreeze_cleanup (void ) +{ +Error *err =NULL ; + +if (ga_is_frozen (ga_state) ==GUEST_FSFREEZE_STATUS_FROZEN ) { +qmp_guest_fsfreeze_thaw (&err); +if (err) { +slog ("failed to clean up frozen filesystems: %s" , +error_get_pretty (err)); +error_free (err); + } + } +} +#endif + +/* linux-specific implementations. avoid this if at all possible. */ +#if defined(__linux__)#if defined(CONFIG_FSFREEZE )static char *get_pci_driver(char const *syspath, int pathlen, Error
**errp)qga/commands-posix.c +0
-147@@ -1467,153 +1606,6 @@ GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error **errp)free_fs_mount_list (&mounts);return ret; } - - -typedef enum { -FSFREEZE_HOOK_THAW =0 , -FSFREEZE_HOOK_FREEZE , -}FsfreezeHookArg ; - -static const char *fsfreeze_hook_arg_string[] = { -"thaw" , -"freeze" , -}; - -static void execute_fsfreeze_hook (FsfreezeHookArg arg,Error **errp) -{ -int status; -pid_t pid; -const char *hook; -const char *arg_str = fsfreeze_hook_arg_string[arg]; -Error *local_err =NULL ; - - hook =ga_fsfreeze_hook (ga_state); -if (!hook) { -return ; - } -if (access (hook,X_OK ) !=0 ) { -error_setg_errno (errp, errno,"can't access fsfreeze hook '%s'" , hook); -return ; - } - -slog ("executing fsfreeze hook with arg '%s'" , arg_str); - pid =fork (); -if (pid ==0 ) { -setsid (); -reopen_fd_to_null (0 ); -reopen_fd_to_null (1 ); -reopen_fd_to_null (2 ); - -execl (hook, hook, arg_str,NULL ); -_exit (EXIT_FAILURE ); - }else if (pid <0 ) { -error_setg_errno (errp, errno,"failed to create child process" ); -return ; - } - -ga_wait_child (pid, &status, &local_err); -if (local_err) { -error_propagate (errp, local_err); -return ; - } - -if (!WIFEXITED (status)) { -error_setg (errp,"fsfreeze hook has terminated abnormally" ); -return ; - } - - status =WEXITSTATUS (status); -if (status) { -error_setg (errp,"fsfreeze hook has failed with status %d" , status); -return ; - } -} - -/* -* Return status of freeze/thaw -*/ -GuestFsfreezeStatus qmp_guest_fsfreeze_status (Error **errp) -{ -if (ga_is_frozen (ga_state)) { -return GUEST_FSFREEZE_STATUS_FROZEN ; - } - -return GUEST_FSFREEZE_STATUS_THAWED ; -} - -int64_t qmp_guest_fsfreeze_freeze (Error **errp) -{ -return qmp_guest_fsfreeze_freeze_list (false,NULL , errp); -} - -int64_t qmp_guest_fsfreeze_freeze_list (bool has_mountpoints, -strList *mountpoints, -Error **errp) -{ -int ret; -FsMountList mounts; -Error *local_err =NULL ; - -slog ("guest-fsfreeze called" ); - -execute_fsfreeze_hook (FSFREEZE_HOOK_FREEZE , &local_err); -if (local_err) { -error_propagate (errp, local_err); -return -1 ; - } - -QTAILQ_INIT (&mounts); -if (!build_fs_mount_list (&mounts, &local_err)) { -error_propagate (errp, local_err); -return -1 ; - } - -/* cannot risk guest agent blocking itself on a write in this state */ -ga_set_frozen (ga_state); - - ret =qmp_guest_fsfreeze_do_freeze_list (has_mountpoints, mountpoints, - mounts, errp); - -free_fs_mount_list (&mounts); -/* We may not issue any FIFREEZE here. -* Just unset ga_state here and ready for the next call. -*/ -if (ret ==0 ) { -ga_unset_frozen (ga_state); - }else if (ret <0 ) { -qmp_guest_fsfreeze_thaw (NULL ); - } -return ret; -} - -int64_t qmp_guest_fsfreeze_thaw (Error **errp) -{ -int ret; - - ret =qmp_guest_fsfreeze_do_thaw (errp); -if (ret >=0 ) { -ga_unset_frozen (ga_state); -execute_fsfreeze_hook (FSFREEZE_HOOK_THAW , errp); - }else { - ret =0 ; - } - -return ret; -} - -static void guest_fsfreeze_cleanup (void ) -{ -Error *err =NULL ; - -if (ga_is_frozen (ga_state) ==GUEST_FSFREEZE_STATUS_FROZEN ) { -qmp_guest_fsfreeze_thaw (&err); -if (err) { -slog ("failed to clean up frozen filesystems: %s" , -error_get_pretty (err)); -error_free (err); - } - } -}#endif /*
CONFIG_FSFREEZE*/#if
defined(CONFIG_FSTRIM)qga/main.c +1
-6@@ -37,12 +37,7 @@#include "qga/service-win32.h" #include "qga/vss-win32.h" #endif -#ifdef __linux__ -#include <linux/fs.h> -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#endif +#include "commands-common.h" #ifndef _WIN32#ifdef __FreeBSD__qga/meson.build +3
-1@@ -75,6 +75,9 @@ qga_ss.add(when: 'CONFIG_POSIX', if_true: files( qga_ss.add(when: 'CONFIG_LINUX', if_true: files( 'commands-linux.c', )) +qga_ss.add(when: 'CONFIG_BSD', if_true: files( + 'commands-bsd.c', +)) qga_ss.add(when: 'CONFIG_WIN32', if_true: files( 'channel-win32.c', 'commands-win32.c', --2.34.1
Signature · 1 line
Marc-André Lureau
PATCH v2 4/7 qga: Add shutdown/halt/reboot support for FreeBSD
In reply to Alexander IvanovAdd appropriate shutdown command arguments to qmp_guest_shutdown() for FreeBSD.
--- qga/commands-posix.c | 7 +++++++ 1 file changed, 7 insertions(+)
qga/commands-posix.c +7 -0
@@ -90,6 +90,10 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)const char *powerdown_flag ="-i5" ;const char *halt_flag ="-i0" ;const char *reboot_flag ="-i6" ; +#elif defined(CONFIG_BSD ) +const char *powerdown_flag ="-p" ; +const char *halt_flag ="-h" ; +const char *reboot_flag ="-r" ;#else const char *powerdown_flag ="-P" ;const char *halt_flag ="-H" ;
@@ -120,6 +124,9 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)#ifdef CONFIG_SOLARIS execl ("/sbin/shutdown" ,"shutdown" , shutdown_flag,"-g0" ,"-y" ,"hypervisor initiated shutdown" , (char *)NULL ); +#elif defined(CONFIG_BSD ) +execl ("/sbin/shutdown" ,"shutdown" , shutdown_flag,"+0" , +"hypervisor initiated shutdown" , (char *)NULL );#else execl ("/sbin/shutdown" ,"shutdown" ,"-h" , shutdown_flag,"+0" ,"hypervisor initiated shutdown" , (char *)NULL );
Signature · 1 line
2.34.1
Re: [PATCH 4/7] qga: Add shutdown/halt/reboot support for FreeBSD
Quoted 5 lines · Alexander Ivanov
Add appropriate shutdown command arguments to
qmp_guest_shutdown()for FreeBSD.Signed-off-by Alexander Ivanov <[email protected]>
Quoted 36 lines
--- qga/commands-posix.c | 7 +++++++ 1 file changed, 7 insertions(+)qga/commands-posix.c +4
-0@@ -90,6 +90,10 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)const char *powerdown_flag ="-i5" ;const char *halt_flag ="-i0" ;const char *reboot_flag ="-i6" ; +#elif defined(CONFIG_BSD ) +const char *powerdown_flag ="-p" ; +const char *halt_flag ="-h" ; +const char *reboot_flag ="-r" ;#else const char *powerdown_flag ="-P" ;const char *halt_flag = "-H";qga/commands-posix.c +3
-0@@ -120,6 +124,9 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)#ifdef CONFIG_SOLARIS execl ("/sbin/shutdown" ,"shutdown" , shutdown_flag,"-g0" ,"-y" ,"hypervisor initiated shutdown" , (char *)NULL ); +#elif defined(CONFIG_BSD ) +execl ("/sbin/shutdown" ,"shutdown" , shutdown_flag,"+0" , +"hypervisor initiated shutdown" , (char *)NULL );#else execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0","hypervisor initiated shutdown", (char *)NULL);--
2.34.1
Signature · 1 line
Marc-André Lureau
PATCH v2 5/7 qga: Add support for user password setting in FreeBSD
In reply to Alexander IvanovMove qmp_guest_set_user_password() from __linux__ condition to (__linux__ || __FreeBSD__) condition. Add command and arguments for password setting in FreeBSD.
--- qga/commands-posix.c | 223 +++++++++++++++++++++++-------------------- 1 file changed, 118 insertions(+), 105 deletions(-)
qga/commands-posix.c +118 -105
@@ -2123,111 +2123,6 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)return processed; } -void qmp_guest_set_user_password (const char *username, -const char *password, -bool crypted, -Error **errp) -{ -Error *local_err =NULL ; -char *passwd_path =NULL ; -pid_t pid; -int status; -int datafd[2 ] = {-1 ,-1 }; -char *rawpasswddata =NULL ; -size_t rawpasswdlen; -char *chpasswddata =NULL ; -size_t chpasswdlen; - - rawpasswddata = (char *)qbase64_decode (password,-1 , &rawpasswdlen, errp); -if (!rawpasswddata) { -return ; - } - rawpasswddata =g_renew (char, rawpasswddata, rawpasswdlen +1 ); - rawpasswddata[rawpasswdlen] ='\0' ; - -if (strchr (rawpasswddata,'\n' )) { -error_setg (errp,"forbidden characters in raw password" ); - goto out; - } - -if (strchr (username,'\n' ) || -strchr (username,':' )) { -error_setg (errp,"forbidden characters in username" ); - goto out; - } - - chpasswddata =g_strdup_printf ("%s:%s\n" , username, rawpasswddata); - chpasswdlen =strlen (chpasswddata); - - passwd_path =g_find_program_in_path ("chpasswd" ); - -if (!passwd_path) { -error_setg (errp,"cannot find 'passwd' program in PATH" ); - goto out; - } - -if (!g_unix_open_pipe (datafd,FD_CLOEXEC ,NULL )) { -error_setg (errp,"cannot create pipe FDs" ); - goto out; - } - - pid =fork (); -if (pid ==0 ) { -close (datafd[1 ]); -/* child */ -setsid (); -dup2 (datafd[0 ],0 ); -reopen_fd_to_null (1 ); -reopen_fd_to_null (2 ); - -if (crypted) { -execl (passwd_path,"chpasswd" ,"-e" ,NULL ); - }else { -execl (passwd_path,"chpasswd" ,NULL ); - } -_exit (EXIT_FAILURE ); - }else if (pid <0 ) { -error_setg_errno (errp, errno,"failed to create child process" ); - goto out; - } -close (datafd[0 ]); - datafd[0 ] =-1 ; - -if (qemu_write_full (datafd[1 ], chpasswddata, chpasswdlen) != chpasswdlen) { -error_setg_errno (errp, errno,"cannot write new account password" ); - goto out; - } -close (datafd[1 ]); - datafd[1 ] =-1 ; - -ga_wait_child (pid, &status, &local_err); -if (local_err) { -error_propagate (errp, local_err); - goto out; - } - -if (!WIFEXITED (status)) { -error_setg (errp,"child process has terminated abnormally" ); - goto out; - } - -if (WEXITSTATUS (status)) { -error_setg (errp,"child process has failed to set user password" ); - goto out; - } - -out: -g_free (chpasswddata); -g_free (rawpasswddata); -g_free (passwd_path); -if (datafd[0 ] !=-1 ) { -close (datafd[0 ]); - } -if (datafd[1 ] !=-1 ) { -close (datafd[1 ]); - } -} -static void ga_read_sysfs_file (int dirfd,const char *pathname,char *buf,int size,Error **errp) {
@@ -2793,6 +2688,124 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)#endif +#if defined(__linux__) || defined(__FreeBSD__) +void qmp_guest_set_user_password (const char *username, +const char *password, +bool crypted, +Error **errp) +{ +Error *local_err =NULL ; +char *passwd_path =NULL ; +pid_t pid; +int status; +int datafd[2 ] = {-1 ,-1 }; +char *rawpasswddata =NULL ; +size_t rawpasswdlen; +char *chpasswddata =NULL ; +size_t chpasswdlen; + + rawpasswddata = (char *)qbase64_decode (password,-1 , &rawpasswdlen, errp); +if (!rawpasswddata) { +return ; + } + rawpasswddata =g_renew (char, rawpasswddata, rawpasswdlen +1 ); + rawpasswddata[rawpasswdlen] ='\0' ; + +if (strchr (rawpasswddata,'\n' )) { +error_setg (errp,"forbidden characters in raw password" ); + goto out; + } + +if (strchr (username,'\n' ) || +strchr (username,':' )) { +error_setg (errp,"forbidden characters in username" ); + goto out; + } + +#ifdef __FreeBSD__ + chpasswddata =g_strdup (rawpasswddata); + passwd_path =g_find_program_in_path ("pw" ); +#else + chpasswddata =g_strdup_printf ("%s:%s\n" , username, rawpasswddata); + passwd_path =g_find_program_in_path ("chpasswd" ); +#endif + + chpasswdlen =strlen (chpasswddata); + +if (!passwd_path) { +error_setg (errp,"cannot find 'passwd' program in PATH" ); + goto out; + } + +if (!g_unix_open_pipe (datafd,FD_CLOEXEC ,NULL )) { +error_setg (errp,"cannot create pipe FDs" ); + goto out; + } + + pid =fork (); +if (pid ==0 ) { +close (datafd[1 ]); +/* child */ +setsid (); +dup2 (datafd[0 ],0 ); +reopen_fd_to_null (1 ); +reopen_fd_to_null (2 ); + +#ifdef __FreeBSD__ +const char *h_arg; + h_arg = (crypted) ?"-H" :"-h" ; +execl (passwd_path,"pw" ,"usermod" ,"-n" , username, h_arg,"0" ,NULL ); +#else +if (crypted) { +execl (passwd_path,"chpasswd" ,"-e" ,NULL ); + }else { +execl (passwd_path,"chpasswd" ,NULL ); + } +#endif +_exit (EXIT_FAILURE ); + }else if (pid <0 ) { +error_setg_errno (errp, errno,"failed to create child process" ); + goto out; + } +close (datafd[0 ]); + datafd[0 ] =-1 ; + +if (qemu_write_full (datafd[1 ], chpasswddata, chpasswdlen) != chpasswdlen) { +error_setg_errno (errp, errno,"cannot write new account password" ); + goto out; + } +close (datafd[1 ]); + datafd[1 ] =-1 ; + +ga_wait_child (pid, &status, &local_err); +if (local_err) { +error_propagate (errp, local_err); + goto out; + } + +if (!WIFEXITED (status)) { +error_setg (errp,"child process has terminated abnormally" ); + goto out; + } + +if (WEXITSTATUS (status)) { +error_setg (errp,"child process has failed to set user password" ); + goto out; + } + +out: +g_free (chpasswddata); +g_free (rawpasswddata); +g_free (passwd_path); +if (datafd[0 ] !=-1 ) { +close (datafd[0 ]); + } +if (datafd[1 ] !=-1 ) { +close (datafd[1 ]); + } +} +#endif +#ifdef HAVE_GETIFADDRS static GuestNetworkInterface * guest_find_interface(GuestNetworkInterfaceList *head,
Signature · 1 line
2.34.1
Re: [PATCH 5/7] qga: Add support for user password setting in FreeBSD
Hi Alexander
Quoted 6 lines · Alexander Ivanov
Move
qmp_guest_set_user_password()from__linux__condition to (__linux__||__FreeBSD__) condition. Add command and arguments for password setting in FreeBSD.Signed-off-by Alexander Ivanov <[email protected]>
Could you explain why you need to move the code?
You could instead have a top declaration?
If it's really required, please split the patch in move + additions.
Quoted 259 lines
--- qga/commands-posix.c | 223 +++++++++++++++++++++++-------------------- 1 file changed, 118 insertions(+), 105 deletions(-)qga/commands-posix.c +0
-72@@ -2123,111 +2123,6 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)return processed; } -void qmp_guest_set_user_password (const char *username, -const char *password, -bool crypted, -Error **errp) -{ -Error *local_err =NULL ; -char *passwd_path =NULL ; -pid_t pid; -int status; -int datafd[2 ] = {-1 ,-1 }; -char *rawpasswddata =NULL ; -size_t rawpasswdlen; -char *chpasswddata =NULL ; -size_t chpasswdlen; - - rawpasswddata = (char *)qbase64_decode (password,-1 , &rawpasswdlen, errp); -if (!rawpasswddata) { -return ; - } - rawpasswddata =g_renew (char, rawpasswddata, rawpasswdlen +1 ); - rawpasswddata[rawpasswdlen] ='\0' ; - -if (strchr (rawpasswddata,'\n' )) { -error_setg (errp,"forbidden characters in raw password" ); - goto out; - } - -if (strchr (username,'\n' ) || -strchr (username,':' )) { -error_setg (errp,"forbidden characters in username" ); - goto out; - } - - chpasswddata =g_strdup_printf ("%s:%s\n" , username, rawpasswddata); - chpasswdlen =strlen (chpasswddata); - - passwd_path =g_find_program_in_path ("chpasswd" ); - -if (!passwd_path) { -error_setg (errp,"cannot find 'passwd' program in PATH" ); - goto out; - } - -if (!g_unix_open_pipe (datafd,FD_CLOEXEC ,NULL )) { -error_setg (errp,"cannot create pipe FDs" ); - goto out; - } - - pid =fork (); -if (pid ==0 ) { -close (datafd[1 ]); -/* child */ -setsid (); -dup2 (datafd[0 ],0 ); -reopen_fd_to_null (1 ); -reopen_fd_to_null (2 ); - -if (crypted) { -execl (passwd_path,"chpasswd" ,"-e" ,NULL ); - }else { -execl (passwd_path,"chpasswd" ,NULL ); - } -_exit (EXIT_FAILURE ); - }else if (pid <0 ) { -error_setg_errno (errp, errno,"failed to create child process" ); - goto out; - } -close (datafd[0 ]); - datafd[0 ] =-1 ; - -if (qemu_write_full (datafd[1 ], chpasswddata, chpasswdlen) != chpasswdlen) { - error_setg_errno(errp, errno, "cannot write new accountpassword");
qga/commands-posix.c +83
-33- goto out; - } -close (datafd[1 ]); - datafd[1 ] =-1 ; - -ga_wait_child (pid, &status, &local_err); -if (local_err) { -error_propagate (errp, local_err); - goto out; - } - -if (!WIFEXITED (status)) { -error_setg (errp,"child process has terminated abnormally" ); - goto out; - } - -if (WEXITSTATUS (status)) { -error_setg (errp,"child process has failed to set user password" ); - goto out; - } - -out: -g_free (chpasswddata); -g_free (rawpasswddata); -g_free (passwd_path); -if (datafd[0 ] !=-1 ) { -close (datafd[0 ]); - } -if (datafd[1 ] !=-1 ) { -close (datafd[1 ]); - } -} -static void ga_read_sysfs_file (int dirfd,const char *pathname,char *buf,int size,Error **errp) {@@ -2793,6 +2688,124 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)#endif +#if defined(__linux__) || defined(__FreeBSD__) +void qmp_guest_set_user_password (const char *username, +const char *password, +bool crypted, +Error **errp) +{ +Error *local_err =NULL ; +char *passwd_path =NULL ; +pid_t pid; +int status; +int datafd[2 ] = {-1 ,-1 }; +char *rawpasswddata =NULL ; +size_t rawpasswdlen; +char *chpasswddata =NULL ; +size_t chpasswdlen; + + rawpasswddata = (char *)qbase64_decode (password,-1 , &rawpasswdlen, errp); +if (!rawpasswddata) { +return ; + } + rawpasswddata =g_renew (char, rawpasswddata, rawpasswdlen +1 ); + rawpasswddata[rawpasswdlen] ='\0' ; + +if (strchr (rawpasswddata,'\n' )) { +error_setg (errp,"forbidden characters in raw password" ); + goto out; + } + +if (strchr (username,'\n' ) || +strchr (username,':' )) { +error_setg (errp,"forbidden characters in username" ); + goto out; + } + +#ifdef __FreeBSD__ + chpasswddata =g_strdup (rawpasswddata); + passwd_path =g_find_program_in_path ("pw" ); +#else + chpasswddata =g_strdup_printf ("%s:%s\n" , username, rawpasswddata); + passwd_path =g_find_program_in_path ("chpasswd" ); +#endif + + chpasswdlen =strlen (chpasswddata); + +if (!passwd_path) { +error_setg (errp,"cannot find 'passwd' program in PATH" ); + goto out; + } + +if (!g_unix_open_pipe (datafd,FD_CLOEXEC ,NULL )) { +error_setg (errp,"cannot create pipe FDs" ); + goto out; + } + + pid =fork (); +if (pid ==0 ) { +close (datafd[1 ]); +/* child */ +setsid (); +dup2 (datafd[0 ],0 ); +reopen_fd_to_null (1 ); +reopen_fd_to_null (2 ); + +#ifdef __FreeBSD__ +const char *h_arg; + h_arg = (crypted) ?"-H" :"-h" ; +execl (passwd_path,"pw" ,"usermod" ,"-n" , username, h_arg,"0" ,NULL ); +#else +if (crypted) { +execl (passwd_path,"chpasswd" ,"-e" ,NULL ); + }else { +execl (passwd_path,"chpasswd" ,NULL ); + } +#endif +_exit (EXIT_FAILURE ); + }else if (pid <0 ) { +error_setg_errno (errp, errno,"failed to create child process" ); + goto out; + } +close (datafd[0 ]); + datafd[0 ] =-1 ; + + if (qemu_write_full(datafd[1], chpasswddata, chpasswdlen) !=chpasswdlen) {
+ error_setg_errno(errp, errno, "cannot write new account
password");qga/commands-posix.c +34
-1+ goto out; + } +close (datafd[1 ]); + datafd[1 ] =-1 ; + +ga_wait_child (pid, &status, &local_err); +if (local_err) { +error_propagate (errp, local_err); + goto out; + } + +if (!WIFEXITED (status)) { +error_setg (errp,"child process has terminated abnormally" ); + goto out; + } + +if (WEXITSTATUS (status)) { +error_setg (errp,"child process has failed to set user password" ); + goto out; + } + +out: +g_free (chpasswddata); +g_free (rawpasswddata); +g_free (passwd_path); +if (datafd[0 ] !=-1 ) { +close (datafd[0 ]); + } +if (datafd[1 ] !=-1 ) { +close (datafd[1 ]); + } +} +#endif +#ifdef HAVE_GETIFADDRS static GuestNetworkInterface * guest_find_interface(GuestNetworkInterfaceList *head, --2.34.1
Signature · 1 line
Marc-André Lureau
Re: [PATCH 5/7] qga: Add support for user password setting in FreeBSD
Quoted 13 lines · Marc-André Lureau
Caution: This is an external email and has a suspicious subject or content. Please take care when clicking links or opening attachments. When in doubt, contact your IT Department
Hi Alexander
On Thu, Sep 29, 2022 at 12:52 PM Alexander Ivanov <[email protected]> wrote:
Move
qmp_guest_set_user_password()from__linux__condition to (__linux__||__FreeBSD__) condition. Add command and arguments for password setting in FreeBSD.
Quoted 6 lines
Signed-off-by Alexander Ivanov <[email protected]>Could you explain why you need to move the code?
You could instead have a top declaration?
Now qmp_guest_set_user_password()is under #ifdef __linux__. I want to use this function for FreeBSD too, so I moved it under (__linux__ || __FreeBSD__) condition. I could create another function for FreeBSD but it would lead to code duplication. Unfortunately I don't see another way to do it except to add (__linux__ || __FreeBSD__) condition, cut the function and paste in this condition. If you could suggest another way I would happy.
Quoted 1 line
If it's really required, please split the patch in move + additions.
Just moving the function without other changes leads to unbuildable code in FreeBSD. I thought it's worse than moving and changing at the same time. I split the patch if you prefer.
Quoted 271 lines
--- qga/commands-posix.c | 223 +++++++++++++++++++++++-------------------- 1 file changed, 118 insertions(+), 105 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 88e0d0fe24..6ce894ca6e 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2123,111 +2123,6 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp) return processed; } -void qmp_guest_set_user_password(const char *username, - const char *password, - bool crypted, - Error **errp) -{ - Error *local_err = NULL; - char *passwd_path = NULL; - pid_t pid; - int status; - int datafd[2] = { -1, -1 }; - char *rawpasswddata = NULL; - size_t rawpasswdlen; - char *chpasswddata = NULL; - size_t chpasswdlen; - - rawpasswddata = (char *)qbase64_decode(password, -1, &rawpasswdlen, errp); - if (!rawpasswddata) { - return; - } - rawpasswddata = g_renew(char, rawpasswddata, rawpasswdlen + 1); - rawpasswddata[rawpasswdlen] = '\0'; - - if (strchr(rawpasswddata, '\n')) { - error_setg(errp, "forbidden characters in raw password"); - goto out; - } - - if (strchr(username, '\n') || - strchr(username, ':')) { - error_setg(errp, "forbidden characters in username"); - goto out; - } - - chpasswddata = g_strdup_printf("%s:%s\n", username, rawpasswddata); - chpasswdlen = strlen(chpasswddata); - - passwd_path = g_find_program_in_path("chpasswd"); - - if (!passwd_path) { - error_setg(errp, "cannot find 'passwd' program in PATH"); - goto out; - } - - if (!g_unix_open_pipe(datafd, FD_CLOEXEC, NULL)) { - error_setg(errp, "cannot create pipe FDs"); - goto out; - } - - pid = fork(); - if (pid == 0) { - close(datafd[1]); - /* child */ - setsid(); - dup2(datafd[0], 0); - reopen_fd_to_null(1); - reopen_fd_to_null(2); - - if (crypted) { - execl(passwd_path, "chpasswd", "-e", NULL); - } else { - execl(passwd_path, "chpasswd", NULL); - } - _exit(EXIT_FAILURE); - } else if (pid < 0) { - error_setg_errno(errp, errno, "failed to create child process"); - goto out; - } - close(datafd[0]); - datafd[0] = -1; - - if (qemu_write_full(datafd[1], chpasswddata, chpasswdlen) != chpasswdlen) { - error_setg_errno(errp, errno, "cannot write new account password"); - goto out; - } - close(datafd[1]); - datafd[1] = -1; - - ga_wait_child(pid, &status, &local_err); - if (local_err) { - error_propagate(errp, local_err); - goto out; - } - - if (!WIFEXITED(status)) { - error_setg(errp, "child process has terminated abnormally"); - goto out; - } - - if (WEXITSTATUS(status)) { - error_setg(errp, "child process has failed to set user password"); - goto out; - } - -out: - g_free(chpasswddata); - g_free(rawpasswddata); - g_free(passwd_path); - if (datafd[0] != -1) { - close(datafd[0]); - } - if (datafd[1] != -1) { - close(datafd[1]); - } -} - static void ga_read_sysfs_file(int dirfd, const char *pathname, char *buf, int size, Error **errp) { @@ -2793,6 +2688,124 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp) #endif +#if defined(__linux__) || defined(__FreeBSD__) +void qmp_guest_set_user_password(const char *username, + const char *password, + bool crypted, + Error **errp) +{ + Error *local_err = NULL; + char *passwd_path = NULL; + pid_t pid; + int status; + int datafd[2] = { -1, -1 }; + char *rawpasswddata = NULL; + size_t rawpasswdlen; + char *chpasswddata = NULL; + size_t chpasswdlen; + + rawpasswddata = (char *)qbase64_decode(password, -1, &rawpasswdlen, errp); + if (!rawpasswddata) { + return; + } + rawpasswddata = g_renew(char, rawpasswddata, rawpasswdlen + 1); + rawpasswddata[rawpasswdlen] = '\0'; + + if (strchr(rawpasswddata, '\n')) { + error_setg(errp, "forbidden characters in raw password"); + goto out; + } + + if (strchr(username, '\n') || + strchr(username, ':')) { + error_setg(errp, "forbidden characters in username"); + goto out; + } + +#ifdef __FreeBSD__ + chpasswddata = g_strdup(rawpasswddata); + passwd_path = g_find_program_in_path("pw"); +#else + chpasswddata = g_strdup_printf("%s:%s\n", username, rawpasswddata); + passwd_path = g_find_program_in_path("chpasswd"); +#endif + + chpasswdlen = strlen(chpasswddata); + + if (!passwd_path) { + error_setg(errp, "cannot find 'passwd' program in PATH"); + goto out; + } + + if (!g_unix_open_pipe(datafd, FD_CLOEXEC, NULL)) { + error_setg(errp, "cannot create pipe FDs"); + goto out; + } + + pid = fork(); + if (pid == 0) { + close(datafd[1]); + /* child */ + setsid(); + dup2(datafd[0], 0); + reopen_fd_to_null(1); + reopen_fd_to_null(2); + +#ifdef __FreeBSD__ + const char *h_arg; + h_arg = (crypted) ? "-H" : "-h"; + execl(passwd_path, "pw", "usermod", "-n", username, h_arg, "0", NULL); +#else + if (crypted) { + execl(passwd_path, "chpasswd", "-e", NULL); + } else { + execl(passwd_path, "chpasswd", NULL); + } +#endif + _exit(EXIT_FAILURE); + } else if (pid < 0) { + error_setg_errno(errp, errno, "failed to create child process"); + goto out; + } + close(datafd[0]); + datafd[0] = -1; + + if (qemu_write_full(datafd[1], chpasswddata, chpasswdlen) != chpasswdlen) { + error_setg_errno(errp, errno, "cannot write new account password"); + goto out; + } + close(datafd[1]); + datafd[1] = -1; + + ga_wait_child(pid, &status, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + + if (!WIFEXITED(status)) { + error_setg(errp, "child process has terminated abnormally"); + goto out; + } + + if (WEXITSTATUS(status)) { + error_setg(errp, "child process has failed to set user password"); + goto out; + } + +out: + g_free(chpasswddata); + g_free(rawpasswddata); + g_free(passwd_path); + if (datafd[0] != -1) { + close(datafd[0]); + } + if (datafd[1] != -1) { + close(datafd[1]); + } +} +#endif + #ifdef HAVE_GETIFADDRS static GuestNetworkInterface * guest_find_interface(GuestNetworkInterfaceList *head, -- 2.34.1Signature · 1 line
Marc-André Lureau
Re: [PATCH 5/7] qga: Add support for user password setting in FreeBSD
Hi
Quoted 21 lines · Alexander Ivanov
Quoted 19 lines · Marc-André Lureau
Caution: This is an external email and has a suspicious subject or content. Please take care when clicking links or opening attachments. When in doubt, contact your IT Department
Hi Alexander
On Thu, Sep 29, 2022 at 12:52 PM Alexander Ivanov
<[email protected]> wrote:Move
qmp_guest_set_user_password()from__linux__condition to (__linux__||__FreeBSD__) condition. Add command and arguments for password setting in FreeBSD.Signed-off-by Alexander Ivanov <[email protected]>
Quoted 7 lines
Quoted 3 lines
Could you explain why you need to move the code?
You could instead have a top declaration?
Now qmp_guest_set_user_password()is under #ifdef
__linux__. I want to use this function for FreeBSD too, so I moved it under (__linux__||__FreeBSD__) condition. I could create another function for FreeBSD but
Why not make the following change?
qga/commands-posix.c +0 -0
@@ -2122,7 +2122,9 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList
*vcpus, Error **errp)
return processed;
}
+#endif /* linux */
+#if defined(__linux__) || defined(__FreeBSD__)
void qmp_guest_set_user_password(const char *username,
const char *password, bool crypted,
@@ -2227,7 +2229,9 @@ out:
close(datafd[1]);
} }
+#endif /* linux || freebsd */
+#if defined(__linux__)
static void ga_read_sysfs_file(int dirfd, const char *pathname, char *buf,
int size, Error **errp)
{
Quoted 281 lines
it would lead to code duplication. Unfortunately I don't see another way to do it except to add (
__linux__||__FreeBSD__) condition, cut the function and paste in this condition. If you could suggest another way I would happy.Quoted 1 line
If it's really required, please split the patch in move + additions.
Just moving the function without other changes leads to unbuildable code in FreeBSD. I thought it's worse than moving and changing at the same time. I split the patch if you prefer.
Quoted 270 lines
---
qga/commands-posix.c| 223
+++++++++++++++++++++++--------------------
1 file changed, 118 insertions(+), 105 deletions(-)diff --git
a/qga/commands-posix.cb/qga/commands-posix.cindex88e0d0fe24..6ce894ca6e100644
---a/qga/commands-posix.c
+++b/qga/commands-posix.c
@@ -2123,111 +2123,6 @@int64_tqmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)
return processed;
}-void qmp_guest_set_user_password(const char *username,
- const char *password,
- bool crypted,
- Error **errp)
-{
- Error*local_err= NULL;
- char*passwd_path= NULL;
-pid_tpid;
- int status;
- int datafd[2] = { -1, -1 };
- char *rawpasswddata = NULL;
-size_trawpasswdlen;
- char *chpasswddata = NULL;
-size_tchpasswdlen;
-
- rawpasswddata = (char *)qbase64_decode(password, -1,
&rawpasswdlen, errp);
- if (!rawpasswddata) {
- return;
- }
- rawpasswddata =g_renew(char, rawpasswddata, rawpasswdlen + 1);
- rawpasswddata[rawpasswdlen] = '\0';
-
- if (strchr(rawpasswddata, '\n')) {
-error_setg(errp, "forbidden characters in raw password");
- goto out;
- }
-
- if (strchr(username, '\n')||
-strchr(username, ':')) {
-error_setg(errp, "forbidden characters in username");
- goto out;
- }
-
- chpasswddata = g_strdup_printf("%s:%s\n", username,
rawpasswddata);
- chpasswdlen = strlen(chpasswddata);
-
-passwd_path=g_find_program_in_path("chpasswd");
-
- if (!passwd_path) {
-error_setg(errp, "cannot find 'passwd' program in PATH");
- goto out;
- }
-
- if (!g_unix_open_pipe(datafd,FD_CLOEXEC, NULL)) {
-error_setg(errp, "cannot create pipe FDs");
- goto out;
- }
-
- pid =fork();
- if (pid == 0) {
-close(datafd[1]);
- /* child */
-setsid();
-dup2(datafd[0], 0);
-reopen_fd_to_null(1);
-reopen_fd_to_null(2);
-
- if (crypted) {
-execl(passwd_path, "chpasswd", "-e", NULL);
- } else {
-execl(passwd_path, "chpasswd", NULL);
- }
-_exit(EXIT_FAILURE);
- } else if (pid < 0) {
- error_setg_errno(errp, errno, "failed to create child
process");
- goto out;
- }
-close(datafd[0]);
- datafd[0] = -1;
-
- if (qemu_write_full(datafd[1], chpasswddata, chpasswdlen)!=
chpasswdlen) {
- error_setg_errno(errp, errno, "cannot write new account
password");
- goto out;
- }
-close(datafd[1]);
- datafd[1] = -1;
-
-ga_wait_child(pid, &status, &local_err);
- if (local_err) {
-error_propagate(errp, local_err);
- goto out;
- }
-
- if (!WIFEXITED(status)) {
-error_setg(errp, "child process has terminated abnormally");
- goto out;
- }
-
- if (WEXITSTATUS(status)) {
- error_setg(errp, "child process has failed to set user
password");
- goto out;
- }
-
-out:
-g_free(chpasswddata);
-g_free(rawpasswddata);
-g_free(passwd_path);
- if (datafd[0] != -1) {
-close(datafd[0]);
- }
- if (datafd[1] != -1) {
-close(datafd[1]);
- }
-}
-
static void ga_read_sysfs_file(int dirfd, const char *pathname,
char *buf,
int size, Error **errp)
{
@@ -2793,6 +2688,124 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp)#endif
+#if
defined(__linux__)||defined(__FreeBSD__)+void qmp_guest_set_user_password(const char *username,
+ const char *password,
+ bool crypted,
+ Error **errp)
+{
+ Error*local_err= NULL;
+ char*passwd_path= NULL;
+pid_tpid;
+ int status;
+ int datafd[2] = { -1, -1 };
+ char *rawpasswddata = NULL;
+size_trawpasswdlen;
+ char *chpasswddata = NULL;
+size_tchpasswdlen;
+
+ rawpasswddata = (char *)qbase64_decode(password, -1,
&rawpasswdlen, errp);
+ if (!rawpasswddata) {
+ return;
+ }
+ rawpasswddata =g_renew(char, rawpasswddata, rawpasswdlen + 1);
+ rawpasswddata[rawpasswdlen] = '\0';
+
+ if (strchr(rawpasswddata, '\n')) {
+error_setg(errp, "forbidden characters in raw password");
+ goto out;
+ }
+
+ if (strchr(username, '\n')||
+strchr(username, ':')) {
+error_setg(errp, "forbidden characters in username");
+ goto out;
+ }
+
+#ifdef__FreeBSD__
+ chpasswddata =g_strdup(rawpasswddata);
+passwd_path=g_find_program_in_path("pw");
+#else
+ chpasswddata = g_strdup_printf("%s:%s\n", username,
rawpasswddata);
+passwd_path=g_find_program_in_path("chpasswd");
+#endif
+
+ chpasswdlen = strlen(chpasswddata);
+
+ if (!passwd_path) {
+error_setg(errp, "cannot find 'passwd' program in PATH");
+ goto out;
+ }
+
+ if (!g_unix_open_pipe(datafd,FD_CLOEXEC, NULL)) {
+error_setg(errp, "cannot create pipe FDs");
+ goto out;
+ }
+
+ pid =fork();
+ if (pid == 0) {
+close(datafd[1]);
+ /* child */
+setsid();
+dup2(datafd[0], 0);
+reopen_fd_to_null(1);
+reopen_fd_to_null(2);
+
+#ifdef__FreeBSD__
+ const char*h_arg;
+h_arg= (crypted) ? "-H" : "-h";
+ execl(passwd_path, "pw", "usermod", "-n", username,
h_arg, "0", NULL);
+#else
+ if (crypted) {
+execl(passwd_path, "chpasswd", "-e", NULL);
+ } else {
+execl(passwd_path, "chpasswd", NULL);
+ }
+#endif
+_exit(EXIT_FAILURE);
+ } else if (pid < 0) {
+ error_setg_errno(errp, errno, "failed to create child
process");
+ goto out;
+ }
+close(datafd[0]);
+ datafd[0] = -1;
+
+ if (qemu_write_full(datafd[1], chpasswddata, chpasswdlen)!=
chpasswdlen) {
+ error_setg_errno(errp, errno, "cannot write new account
password");
+ goto out;
+ }
+close(datafd[1]);
+ datafd[1] = -1;
+
+ga_wait_child(pid, &status, &local_err);
+ if (local_err) {
+error_propagate(errp, local_err);
+ goto out;
+ }
+
+ if (!WIFEXITED(status)) {
+error_setg(errp, "child process has terminated abnormally");
+ goto out;
+ }
+
+ if (WEXITSTATUS(status)) {
+ error_setg(errp, "child process has failed to set user
password");
+ goto out;
+ }
+
+out:
+g_free(chpasswddata);
+g_free(rawpasswddata);
+g_free(passwd_path);
+ if (datafd[0] != -1) {
+close(datafd[0]);
+ }
+ if (datafd[1] != -1) {
+close(datafd[1]);
+ }
+}
+#endif
+
#ifdefHAVE_GETIFADDRS
static GuestNetworkInterface * guest_find_interface(GuestNetworkInterfaceList *head,
--
2.34.1--
Marc-André Lureau
Signature · 1 line
Marc-André Lureau
Re: [PATCH 5/7] qga: Add support for user password setting in FreeBSD
Hi
Quoted 40 lines · Marc-André Lureau
Caution: This is an external email and has a suspicious subject or content. Please take care when clicking links or opening attachments. When in doubt, contact your IT Department
Hi
On Thu, Sep 29, 2022 at 6:29 PM Alexander Ivanov <[email protected]> wrote:
On 29.09.2022 13:22, Marc-André Lureau wrote: > > > Caution: This is an external email and has a suspicious subject or > content. Please take care when clicking links or opening attachments. > When in doubt, contact your IT Department > > > Hi Alexander > > On Thu, Sep 29, 2022 at 12:52 PM Alexander Ivanov > <[email protected]> wrote: > > Move qmp_guest_set_user_password() from __linux__ condition to > (__linux__ || __FreeBSD__) condition. Add command and arguments > for password setting in FreeBSD. > > Signed-off-by: Alexander Ivanov <[email protected]> > > > Could you explain why you need to move the code? > > You could instead have a top declaration? Now qmp_guest_set_user_password()is under #ifdef __linux__. I want to use this function for FreeBSD too, so I moved it under (__linux__ || __FreeBSD__) condition. I could create another function for FreeBSD but
Quoted 1 line
Why not make the following change?
I thought it is a bad idea to multiply pieces of code under the same arch conditions. OK, I will change the code in this way. Thank you.
Quoted 326 lines
qga/commands-posix.c +2
-0@@ -2122,7 +2122,9 @@ int64_tqmp_guest_set_vcpus (GuestLogicalProcessorList *vcpus, Error **errp) return processed; } +#endif /* linux */ +#if defined(__linux__) || defined(__FreeBSD__) void qmp_guest_set_user_password(const char *username, const char *password,bool crypted,
qga/commands-posix.c +2
-0@@ -2227,7 +2229,9 @@ out: close(datafd[1]); } } +#endif /* linux || freebsd */ +#if defined(__linux__) static void ga_read_sysfs_file(int dirfd, const char *pathname, char *buf, int size, Error **errp) {it would lead to code duplication. Unfortunately I don't see another way to do it except to add (__linux__ || __FreeBSD__) condition, cut the function and paste in this condition. If you could suggest another way I would happy. > If it's really required, please split the patch in move + additions. Just moving the function without other changes leads to unbuildable code in FreeBSD. I thought it's worse than moving and changing at the same time. I split the patch if you prefer. > > --- > qga/commands-posix.c | 223 > +++++++++++++++++++++++-------------------- > 1 file changed, 118 insertions(+), 105 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 88e0d0fe24..6ce894ca6e 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -2123,111 +2123,6 @@ int64_t > qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp) > return processed; > } > > -void qmp_guest_set_user_password(const char *username, > - const char *password, > - bool crypted, > - Error **errp) > -{ > - Error *local_err = NULL; > - char *passwd_path = NULL; > - pid_t pid; > - int status; > - int datafd[2] = { -1, -1 }; > - char *rawpasswddata = NULL; > - size_t rawpasswdlen; > - char *chpasswddata = NULL; > - size_t chpasswdlen; > - > - rawpasswddata = (char *)qbase64_decode(password, -1, > &rawpasswdlen, errp); > - if (!rawpasswddata) { > - return; > - } > - rawpasswddata = g_renew(char, rawpasswddata, rawpasswdlen + 1); > - rawpasswddata[rawpasswdlen] = '\0'; > - > - if (strchr(rawpasswddata, '\n')) { > - error_setg(errp, "forbidden characters in raw password"); > - goto out; > - } > - > - if (strchr(username, '\n') || > - strchr(username, ':')) { > - error_setg(errp, "forbidden characters in username"); > - goto out; > - } > - > - chpasswddata = g_strdup_printf("%s:%s\n", username, > rawpasswddata); > - chpasswdlen = strlen(chpasswddata); > - > - passwd_path = g_find_program_in_path("chpasswd"); > - > - if (!passwd_path) { > - error_setg(errp, "cannot find 'passwd' program in PATH"); > - goto out; > - } > - > - if (!g_unix_open_pipe(datafd, FD_CLOEXEC, NULL)) { > - error_setg(errp, "cannot create pipe FDs"); > - goto out; > - } > - > - pid = fork(); > - if (pid == 0) { > - close(datafd[1]); > - /* child */ > - setsid(); > - dup2(datafd[0], 0); > - reopen_fd_to_null(1); > - reopen_fd_to_null(2); > - > - if (crypted) { > - execl(passwd_path, "chpasswd", "-e", NULL); > - } else { > - execl(passwd_path, "chpasswd", NULL); > - } > - _exit(EXIT_FAILURE); > - } else if (pid < 0) { > - error_setg_errno(errp, errno, "failed to create child > process"); > - goto out; > - } > - close(datafd[0]); > - datafd[0] = -1; > - > - if (qemu_write_full(datafd[1], chpasswddata, chpasswdlen) != > chpasswdlen) { > - error_setg_errno(errp, errno, "cannot write new account > password"); > - goto out; > - } > - close(datafd[1]); > - datafd[1] = -1; > - > - ga_wait_child(pid, &status, &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > - goto out; > - } > - > - if (!WIFEXITED(status)) { > - error_setg(errp, "child process has terminated abnormally"); > - goto out; > - } > - > - if (WEXITSTATUS(status)) { > - error_setg(errp, "child process has failed to set user > password"); > - goto out; > - } > - > -out: > - g_free(chpasswddata); > - g_free(rawpasswddata); > - g_free(passwd_path); > - if (datafd[0] != -1) { > - close(datafd[0]); > - } > - if (datafd[1] != -1) { > - close(datafd[1]); > - } > -} > - > static void ga_read_sysfs_file(int dirfd, const char *pathname, > char *buf, > int size, Error **errp) > { > @@ -2793,6 +2688,124 @@ GuestMemoryBlockInfo > *qmp_guest_get_memory_block_info(Error **errp) > > #endif > > +#if defined(__linux__) || defined(__FreeBSD__) > +void qmp_guest_set_user_password(const char *username, > + const char *password, > + bool crypted, > + Error **errp) > +{ > + Error *local_err = NULL; > + char *passwd_path = NULL; > + pid_t pid; > + int status; > + int datafd[2] = { -1, -1 }; > + char *rawpasswddata = NULL; > + size_t rawpasswdlen; > + char *chpasswddata = NULL; > + size_t chpasswdlen; > + > + rawpasswddata = (char *)qbase64_decode(password, -1, > &rawpasswdlen, errp); > + if (!rawpasswddata) { > + return; > + } > + rawpasswddata = g_renew(char, rawpasswddata, rawpasswdlen + 1); > + rawpasswddata[rawpasswdlen] = '\0'; > + > + if (strchr(rawpasswddata, '\n')) { > + error_setg(errp, "forbidden characters in raw password"); > + goto out; > + } > + > + if (strchr(username, '\n') || > + strchr(username, ':')) { > + error_setg(errp, "forbidden characters in username"); > + goto out; > + } > + > +#ifdef __FreeBSD__ > + chpasswddata = g_strdup(rawpasswddata); > + passwd_path = g_find_program_in_path("pw"); > +#else > + chpasswddata = g_strdup_printf("%s:%s\n", username, > rawpasswddata); > + passwd_path = g_find_program_in_path("chpasswd"); > +#endif > + > + chpasswdlen = strlen(chpasswddata); > + > + if (!passwd_path) { > + error_setg(errp, "cannot find 'passwd' program in PATH"); > + goto out; > + } > + > + if (!g_unix_open_pipe(datafd, FD_CLOEXEC, NULL)) { > + error_setg(errp, "cannot create pipe FDs"); > + goto out; > + } > + > + pid = fork(); > + if (pid == 0) { > + close(datafd[1]); > + /* child */ > + setsid(); > + dup2(datafd[0], 0); > + reopen_fd_to_null(1); > + reopen_fd_to_null(2); > + > +#ifdef __FreeBSD__ > + const char *h_arg; > + h_arg = (crypted) ? "-H" : "-h"; > + execl(passwd_path, "pw", "usermod", "-n", username, > h_arg, "0", NULL); > +#else > + if (crypted) { > + execl(passwd_path, "chpasswd", "-e", NULL); > + } else { > + execl(passwd_path, "chpasswd", NULL); > + } > +#endif > + _exit(EXIT_FAILURE); > + } else if (pid < 0) { > + error_setg_errno(errp, errno, "failed to create child > process"); > + goto out; > + } > + close(datafd[0]); > + datafd[0] = -1; > + > + if (qemu_write_full(datafd[1], chpasswddata, chpasswdlen) != > chpasswdlen) { > + error_setg_errno(errp, errno, "cannot write new account > password"); > + goto out; > + } > + close(datafd[1]); > + datafd[1] = -1; > + > + ga_wait_child(pid, &status, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + goto out; > + } > + > + if (!WIFEXITED(status)) { > + error_setg(errp, "child process has terminated abnormally"); > + goto out; > + } > + > + if (WEXITSTATUS(status)) { > + error_setg(errp, "child process has failed to set user > password"); > + goto out; > + } > + > +out: > + g_free(chpasswddata); > + g_free(rawpasswddata); > + g_free(passwd_path); > + if (datafd[0] != -1) { > + close(datafd[0]); > + } > + if (datafd[1] != -1) { > + close(datafd[1]); > + } > +} > +#endif > + > #ifdef HAVE_GETIFADDRS > static GuestNetworkInterface * > guest_find_interface(GuestNetworkInterfaceList *head, > -- > 2.34.1 > > > > > -- > Marc-André LureauSignature · 1 line
Marc-André Lureau
PATCH v2 6/7 qga: Move HW address getting to a separate function
In reply to Alexander IvanovIn the next patch FreeBSD support for guest-network-get-interfaces will be added. Previously move Linux-specific code of HW address getting to a separate functions and add a dumb function to commands-bsd.c.
--- qga/commands-bsd.c | 18 +++++++ qga/commands-common.h | 6 +++ qga/commands-posix.c | 114 +++++++++++++++++++++++------------------- 3 files changed, 87 insertions(+), 51 deletions(-)
qga/commands-bsd.c +18 -0
@@ -167,3 +167,21 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) return NULL; }#endif /* CONFIG_FSFREEZE */ + +#ifdef HAVE_GETIFADDRS +/* +* Fill buf with MAC address by ifaddrs. Pointer buf must point to a +* buffer with ETHER_ADDR_LEN length at least. +* +* Returns -1 in case of an error, 0 if MAC address can't be obtained or +* 1 if MAC addres is obtained. +*/ +int guest_get_hw_addr (struct ifaddrs *ifa,unsigned char *buf,Error **errp) +{ +/* +* We can't get the hw addr of this interface, +* but that's not a fatal error. +*/ +return 0 ; +} +#endif /* HAVE_GETIFADDRS */
qga/commands-common.h +6 -0
@@ -56,6 +56,12 @@ int64_t qmp_guest_fsfreeze_do_freeze_list(bool has_mountpoints,int qmp_guest_fsfreeze_do_thaw (Error **errp);#endif /* CONFIG_FSFREEZE */ +#ifdef HAVE_GETIFADDRS +#include <ifaddrs.h> + +int guest_get_hw_addr (struct ifaddrs *ifa,unsigned char *buf,Error **errp); +#endif +typedef struct GuestFileHandle GuestFileHandle ;GuestFileHandle *guest_file_handle_find (int64_t id,Error **errp);
qga/commands-posix.c +63 -51
165 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH 6/7] qga: Move HW address getting to a separate function
Hi
Quoted 19 lines · Alexander Ivanov
In the next patch FreeBSD support for guest-network-get-interfaces will be added. Previously move Linux-specific code of HW address getting to a separate functions and add a dumb function to
commands-bsd.c.Signed-off-by Alexander Ivanov <[email protected]>--- qga/commands-bsd.c | 18 +++++++ qga/commands-common.h | 6 +++ qga/commands-posix.c | 114 +++++++++++++++++++++++------------------- 3 files changed, 87 insertions(+), 51 deletions(-)qga/commands-bsd.c +0
-0@@ -167,3 +167,21 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)return NULL ;
qga/commands-bsd.c GuestCpuStatsList *qmp_guest_get_cpustats(Error · line 177
Quoted 10 lines
qga/commands-bsd.c +8
-0}#endif /* CONFIG_FSFREEZE */ + +#ifdef HAVE_GETIFADDRS +/* +* Fill buf with MAC address by ifaddrs. Pointer buf must point to a +* buffer with ETHER_ADDR_LEN length at least. +* +* Returns -1 in case of an error, 0 if MAC address can't be obtained or +* 1 if MAC addres is obtained.
Not a typical Error function return value...
Eventually, you could return a bool for error/ok and take an additional "bool *obtained/valid" argument. Just a suggestion.
Quoted 60 lines
+ */
+intguest_get_hw_addr(struct ifaddrs *ifa, unsigned char *buf, Error **errp)qga/commands-bsd.c +8
-0+{ +/* +* We can't get the hw addr of this interface, +* but that's not a fatal error. +*/ +return 0 ; +} +#endif /* HAVE_GETIFADDRS */ qga/commands-common.h +6
-0@@ -56,6 +56,12 @@ int64_t qmp_guest_fsfreeze_do_freeze_list(bool has_mountpoints, int qmp_guest_fsfreeze_do_thaw(Error **errp);#endif /* CONFIG_FSFREEZE */ +#ifdef HAVE_GETIFADDRS +#include <ifaddrs.h> + +int guest_get_hw_addr (struct ifaddrs *ifa,unsigned char *buf,Error **errp); +#endif +typedef struct GuestFileHandle GuestFileHandle ;GuestFileHandle *guest_file_handle_find(int64_t id, Error **errp);
qga/commands-posix.c +1
-9@@ -41,20 +41,12 @@#endif #endif -#ifdef __FreeBSD__ -/* -* The code under HAVE_GETIFADDRS condition can't be compiled in FreeBSD. -* Fix it in one of the following patches. -*/ -#undef HAVE_GETIFADDRS -#endif -#ifdef HAVE_GETIFADDRS #include <arpa/inet.h> #include <sys/socket.h> #include <net/if.h> +#include <net/ethernet.h> #include <sys/types.h> -#include <ifaddrs.h> #ifdef CONFIG_SOLARIS #include <sys/sockio.h> #endif @@ -2659,14 +2651,6 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)return -1 ; }
qga/commands-posix.c int64_t · line 2655
Quoted 10 lines
qga/commands-posix.c +0
-8-void qmp_guest_set_user_password (const char *username, -const char *password, -bool crypted, -Error **errp) -{ -error_setg (errp,QERR_UNSUPPORTED ); -} -
Why this in this patch?
Quoted 143 lines
qga/commands-posix.c +0
-0GuestMemoryBlockList *qmp_guest_get_memory_blocks (Error **errp){ error_setg(errp, QERR_UNSUPPORTED);qga/commands-posix.c +57
-1@@ -2804,7 +2788,15 @@ out: close(datafd[1]); } } -#endif +#else /* __linux__ || __FreeBSD__ */ +void qmp_guest_set_user_password (const char *username, +const char *password, +bool crypted, +Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +} +#endif /* __linux__ || __FreeBSD__ */ #ifdef HAVE_GETIFADDRS static GuestNetworkInterface *@@ -2887,6 +2879,54 @@ static int guest_get_network_stats(const char *name,return -1 ; } +#ifndef __FreeBSD__ +/* +* Fill buf with MAC address by ifaddrs. Pointer buf must point to a +* buffer with ETHER_ADDR_LEN length at least. +* Returns -1 in case of an error, 0 if MAC address can't be obtained or +* 1 if MAC addres is obtained. +*/ +int guest_get_hw_addr (struct ifaddrs *ifa,unsigned char *buf,Error **errp) +{ +struct ifreq ifr; +int sock; + +/* we haven't obtained HW address yet */ + sock =socket (PF_INET ,SOCK_STREAM ,0 ); +if (sock ==-1 ) { +error_setg_errno (errp, errno,"failed to create socket" ); +return -1 ; + } + +memset (&ifr,0 ,sizeof (ifr)); +pstrcpy (ifr.ifr_name,IF_NAMESIZE , ifa->ifa_name); +if (ioctl (sock,SIOCGIFHWADDR , &ifr) ==-1 ) { +/* +* We can't get the hw addr of this interface, but that's not a +* fatal error. Don't set info->hardware_address, but keep +* going. +*/ +if (errno ==EADDRNOTAVAIL ) { +/* The interface doesn't have a hw addr (e.g. loopback). */ +g_debug ("failed to get MAC address of %s: %s" , + ifa->ifa_name,strerror (errno)); + }else { +g_warning ("failed to get MAC address of %s: %s" , + ifa->ifa_name,strerror (errno)); + } +close (sock); +return 0 ; + } +#ifdef CONFIG_SOLARIS +memcpy (buf, &ifr.ifr_addr.sa_data,ETHER_ADDR_LEN ); +#else +memcpy (buf, &ifr.ifr_hwaddr.sa_data,ETHER_ADDR_LEN ); +#endif +close (sock); +return 1 ; +} +#endif /* __FreeBSD__ */ +/* * Build information about guest interfaces */
qga/commands-posix.c +4
-13@@ -2907,10 +2947,9 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)GuestNetworkInterfaceStat *interface_stat =NULL ;char addr4[INET_ADDRSTRLEN ];char addr6[INET6_ADDRSTRLEN ]; -int sock; -struct ifreq ifr; -unsigned char *mac_addr; +unsigned char mac_addr[ETHER_ADDR_LEN ];void *p; +int ret;g_debug ("Processing %s interface" , ifa->ifa_name);@@ -2924,45 +2963,18 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) }if (!info->has_hardware_address) { -/* we haven't obtained HW address yet */ - sock =socket (PF_INET ,SOCK_STREAM ,0 ); -if (sock ==-1 ) { -error_setg_errno (errp, errno,"failed to create socket" ); + ret =guest_get_hw_addr (ifa, mac_addr, errp); +if (ret ==-1 ) { goto error; } - -memset (&ifr,0 ,sizeof (ifr)); -pstrcpy (ifr.ifr_name,IF_NAMESIZE , info->name); -if (ioctl (sock,SIOCGIFHWADDR , &ifr) ==-1 ) { -/* -* We can't get the hw addr of this interface, but that's not a
qga/commands-posix.c +0
-5-* fatal error. Don't set info->hardware_address, but keep -* going. -*/ -if (errno ==EADDRNOTAVAIL ) { -/* The interface doesn't have a hw addr (e.g. loopback). */
qga/commands-posix.c +1
-16-g_debug ("failed to get MAC address of %s: %s" , - ifa->ifa_name,strerror (errno)); - }else { -g_warning ("failed to get MAC address of %s: %s" , - ifa->ifa_name,strerror (errno)); - } - - }else { -#ifdef CONFIG_SOLARIS - mac_addr = (unsigned char *) &ifr.ifr_addr.sa_data; -#else - mac_addr = (unsigned char *) &ifr.ifr_hwaddr.sa_data; -#endif +if (ret ==1 ) { info->hardware_address =g_strdup_printf ("%02x:%02x:%02x:%02x:%02x:%02x" , (int ) mac_addr[0 ], (int ) mac_addr[1 ], (int ) mac_addr[2 ], (int ) mac_addr[3 ], (int ) mac_addr[4 ], (int ) mac_addr[5 ]); - info->has_hardware_address = true; } -close (sock); } if (ifa->ifa_addr && --
Quoted 4 lines
2.34.1
looks ok to me otherwise
Signature · 1 line
Marc-André Lureau
Re: [PATCH 6/7] qga: Move HW address getting to a separate function
Quoted 37 lines · Marc-André Lureau
Hi
On Thu, Sep 29, 2022 at 12:02 PM Alexander Ivanov <[email protected]> wrote:
In the next patch FreeBSD support for guest-network-get-interfaces will be added. Previously move Linux-specific code of HW address getting to a separate functions and add a dumb function to commands-bsd.c. Signed-off-by: Alexander Ivanov <[email protected]> --- qga/commands-bsd.c | 18 +++++++ qga/commands-common.h | 6 +++ qga/commands-posix.c | 114 +++++++++++++++++++++++------------------- 3 files changed, 87 insertions(+), 51 deletions(-) diff --git a/qga/commands-bsd.c b/qga/commands-bsd.c index ca06692179..ca81114171 100644 --- a/qga/commands-bsd.c +++ b/qga/commands-bsd.c @@ -167,3 +167,21 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) return NULL; } #endif /* CONFIG_FSFREEZE */ + +#ifdef HAVE_GETIFADDRS +/* + * Fill buf with MAC address by ifaddrs. Pointer buf must point to a + * buffer with ETHER_ADDR_LEN length at least. + * + * Returns -1 in case of an error, 0 if MAC address can't be obtained or + * 1 if MAC addres is obtained.
Quoted 3 lines
Not a typical Error function return value...
Eventually, you could return a bool for error/ok and take an additional "bool *obtained/valid" argument. Just a suggestion.
Got it.
Quoted 73 lines
+ */
+int guest_get_hw_addr(struct ifaddrs *ifa, unsigned char *buf,
Error **errp)
+{
+ /*
+ * We can't get the hw addr of this interface,
+ * but that's not a fatal error.
+ */
+ return 0;
+}
+#endif /* HAVE_GETIFADDRS */
diff --git a/qga/commands-common.h b/qga/commands-common.h
index 2d9878a634..2485a037fd 100644
--- a/qga/commands-common.h
+++ b/qga/commands-common.h
@@ -56,6 +56,12 @@ int64_t qmp_guest_fsfreeze_do_freeze_list(bool
has_mountpoints,
int qmp_guest_fsfreeze_do_thaw(Error **errp);
#endif /* CONFIG_FSFREEZE */
+#ifdef HAVE_GETIFADDRS
+#include <ifaddrs.h>
+
+int guest_get_hw_addr(struct ifaddrs *ifa, unsigned char *buf,
Error **errp);
+#endif
+
typedef struct GuestFileHandle GuestFileHandle;
GuestFileHandle *guest_file_handle_find(int64_t id, Error **errp);
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 6ce894ca6e..0bebd9e690 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -41,20 +41,12 @@
#endif
#endif
-#ifdef __FreeBSD__
-/*
- * The code under HAVE_GETIFADDRS condition can't be compiled in
FreeBSD.
- * Fix it in one of the following patches.
- */
-#undef HAVE_GETIFADDRS
-#endif
-
#ifdef HAVE_GETIFADDRS
#include <arpa/inet.h>
#include <sys/socket.h>
#include <net/if.h>
+#include <net/ethernet.h>
#include <sys/types.h>
-#include <ifaddrs.h>
#ifdef CONFIG_SOLARIS
#include <sys/sockio.h>
#endif
@@ -2659,14 +2651,6 @@ int64_t
qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp)
return -1;
}
-void qmp_guest_set_user_password(const char *username,
- const char *password,
- bool crypted,
- Error **errp)
-{
- error_setg(errp, QERR_UNSUPPORTED);
-}
-Quoted 1 line
Why this in this patch?
Something went wrong when I re-created patches. My bad. Will fix it.
Quoted 161 lines
GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp) { error_setg(errp, QERR_UNSUPPORTED); @@ -2804,7 +2788,15 @@ out: close(datafd[1]); } } -#endif +#else /* __linux__ || __FreeBSD__ */ +void qmp_guest_set_user_password(const char *username, + const char *password, + bool crypted, + Error **errp) +{ + error_setg(errp, QERR_UNSUPPORTED); +} +#endif /* __linux__ || __FreeBSD__ */ #ifdef HAVE_GETIFADDRS static GuestNetworkInterface * @@ -2887,6 +2879,54 @@ static int guest_get_network_stats(const char *name, return -1; } +#ifndef __FreeBSD__ +/* + * Fill buf with MAC address by ifaddrs. Pointer buf must point to a + * buffer with ETHER_ADDR_LEN length at least. + * Returns -1 in case of an error, 0 if MAC address can't be obtained or + * 1 if MAC addres is obtained. + */ +int guest_get_hw_addr(struct ifaddrs *ifa, unsigned char *buf, Error **errp) +{ + struct ifreq ifr; + int sock; + + /* we haven't obtained HW address yet */ + sock = socket(PF_INET, SOCK_STREAM, 0); + if (sock == -1) { + error_setg_errno(errp, errno, "failed to create socket"); + return -1; + } + + memset(&ifr, 0, sizeof(ifr)); + pstrcpy(ifr.ifr_name, IF_NAMESIZE, ifa->ifa_name); + if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { + /* + * We can't get the hw addr of this interface, but that's not a + * fatal error. Don't set info->hardware_address, but keep + * going. + */ + if (errno == EADDRNOTAVAIL) { + /* The interface doesn't have a hw addr (e.g. loopback). */ + g_debug("failed to get MAC address of %s: %s", + ifa->ifa_name, strerror(errno)); + } else{ + g_warning("failed to get MAC address of %s: %s", + ifa->ifa_name, strerror(errno)); + } + close(sock); + return 0; + } +#ifdef CONFIG_SOLARIS + memcpy(buf, &ifr.ifr_addr.sa_data, ETHER_ADDR_LEN); +#else + memcpy(buf, &ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN); +#endif + close(sock); + return 1; +} +#endif /* __FreeBSD__ */ + /* * Build information about guest interfaces */ @@ -2907,10 +2947,9 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) GuestNetworkInterfaceStat *interface_stat = NULL; char addr4[INET_ADDRSTRLEN]; char addr6[INET6_ADDRSTRLEN]; - int sock; - struct ifreq ifr; - unsigned char *mac_addr; + unsigned char mac_addr[ETHER_ADDR_LEN]; void *p; + int ret; g_debug("Processing %s interface", ifa->ifa_name); @@ -2924,45 +2963,18 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) } if (!info->has_hardware_address) { - /* we haven't obtained HW address yet */ - sock = socket(PF_INET, SOCK_STREAM, 0); - if (sock == -1) { - error_setg_errno(errp, errno, "failed to create socket"); + ret = guest_get_hw_addr(ifa, mac_addr, errp); + if (ret == -1) { goto error; } - - memset(&ifr, 0, sizeof(ifr)); - pstrcpy(ifr.ifr_name, IF_NAMESIZE, info->name); - if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { - /* - * We can't get the hw addr of this interface, but that's not a - * fatal error. Don't set info->hardware_address, but keep - * going. - */ - if (errno == EADDRNOTAVAIL) { - /* The interface doesn't have a hw addr (e.g. loopback). */ - g_debug("failed to get MAC address of %s: %s", - ifa->ifa_name, strerror(errno)); - } else{ - g_warning("failed to get MAC address of %s: %s", - ifa->ifa_name, strerror(errno)); - } - - } else { -#ifdef CONFIG_SOLARIS - mac_addr = (unsigned char *) &ifr.ifr_addr.sa_data; -#else - mac_addr = (unsigned char *) &ifr.ifr_hwaddr.sa_data; -#endif + if (ret == 1) { info->hardware_address = g_strdup_printf("%02x:%02x:%02x:%02x:%02x:%02x", (int) mac_addr[0], (int) mac_addr[1], (int) mac_addr[2], (int) mac_addr[3], (int) mac_addr[4], (int) mac_addr[5]); - info->has_hardware_address = true; } - close(sock); } if (ifa->ifa_addr && -- 2.34.1looks ok to me otherwise
Signature · 1 line
Marc-André Lureau
PATCH v2 7/7 qga: Add HW address getting for FreeBSD
In reply to Alexander IvanovReplace a dumb function in commands-bsd.c by the code of HW address getting.
--- qga/commands-bsd.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
qga/commands-bsd.c +12 -5
@@ -20,6 +20,8 @@#include <sys/param.h> #include <sys/ucred.h> #include <sys/mount.h> +#include <net/if_dl.h> +#include <net/ethernet.h> #include <paths.h> #if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM )
@@ -178,10 +180,15 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)*/ int guest_get_hw_addr (struct ifaddrs *ifa,unsigned char *buf,Error **errp) { -/* -* We can't get the hw addr of this interface, -* but that's not a fatal error. -*/ -return 0 ; +struct sockaddr_dl *sdp; + +if (ifa->ifa_addr->sa_family !=AF_LINK ) { +/* We can get HW address only for AF_LINK family */ +g_debug ("failed to get MAC address of %s" , ifa->ifa_name); +return 0 ; + } + sdp = (struct sockaddr_dl *)ifa->ifa_addr; +memcpy (buf, sdp->sdl_data + sdp->sdl_nlen,ETHER_ADDR_LEN ); +return 1 ; }#endif /* HAVE_GETIFADDRS */
Signature · 1 line
2.34.1
Re: [PATCH 7/7] qga: Add HW address getting for FreeBSD
Hi
Quoted 5 lines · Alexander Ivanov
Replace a dumb function in
commands-bsd.cby the code of HW address getting.Signed-off-by Alexander Ivanov <[email protected]>
lgtm
Quoted 45 lines
--- qga/commands-bsd.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)qga/commands-bsd.c +12
-5@@ -20,6 +20,8 @@#include <sys/param.h> #include <sys/ucred.h> #include <sys/mount.h> +#include <net/if_dl.h> +#include <net/ethernet.h> #include <paths.h> #if defined(CONFIG_FSFREEZE ) || defined(CONFIG_FSTRIM )@@ -178,10 +180,15 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error**errp) */ int guest_get_hw_addr (struct ifaddrs *ifa,unsigned char *buf,Error **errp) { -/* -* We can't get the hw addr of this interface, -* but that's not a fatal error. -*/ -return 0 ; +struct sockaddr_dl *sdp; + +if (ifa->ifa_addr->sa_family !=AF_LINK ) { +/* We can get HW address only for AF_LINK family */ +g_debug ("failed to get MAC address of %s" , ifa->ifa_name); +return 0 ; + } + sdp = (struct sockaddr_dl *)ifa->ifa_addr; +memcpy (buf, sdp->sdl_data + sdp->sdl_nlen,ETHER_ADDR_LEN ); +return 1 ;}
#endif /*HAVE_GETIFADDRS*/
--
2.34.1
Signature · 1 line
Marc-André Lureau