Skip to content

Commit

Permalink
qga: add qga_open_cloexec() helper
Browse files Browse the repository at this point in the history
QGA calls qemu_open_old() in various places. Calling qemu_open() instead
isn't a great alternative, as it has special "/dev/fdset" handling and
depends on QEMU internal monitor data structures.

Instead, provide a simple helper for QGA needs, with Error* support. The
following patches will make use of it.

Signed-off-by: Marc-André Lureau <[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
Message-Id: <[email protected]>
  • Loading branch information
elmarco committed May 28, 2022
1 parent 69f56c1 commit 0edbfbe
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 0 deletions.
33 changes: 33 additions & 0 deletions qga/cutils.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* 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 "cutils.h"

#include "qapi/error.h"

/**
* qga_open_cloexec:
* @name: the pathname to open
* @flags: as in open()
* @mode: as in open()
*
* A wrapper for open() function which sets O_CLOEXEC.
*
* On error, -1 is returned.
*/
int qga_open_cloexec(const char *name, int flags, mode_t mode)
{
int ret;

#ifdef O_CLOEXEC
ret = open(name, flags | O_CLOEXEC, mode);
#else
ret = open(name, flags, mode);
if (ret >= 0) {
qemu_set_cloexec(ret);
}
#endif

return ret;
}
8 changes: 8 additions & 0 deletions qga/cutils.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#ifndef CUTILS_H_
#define CUTILS_H_

#include "qemu/osdep.h"

int qga_open_cloexec(const char *name, int flags, mode_t mode);

#endif /* CUTILS_H_ */
1 change: 1 addition & 0 deletions qga/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ qga_ss.add(files(
'commands.c',
'guest-agent-command-state.c',
'main.c',
'cutils.c',
))
qga_ss.add(when: 'CONFIG_POSIX', if_true: files(
'channel-posix.c',
Expand Down

0 comments on commit 0edbfbe

Please sign in to comment.