qga: Ditch g_get_host_name()
PATCH v3 1/2 util: Introduce qemu_get_host_name()
In reply to Michal PrivoznikThis function offers operating system agnostic way to fetch host name. It is implemented for both POSIX-like and Windows systems.
--- include/qemu/osdep.h | 10 ++++++++++ util/oslib-posix.c | 35 +++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 13 +++++++++++++ 3 files changed, 58 insertions(+)
include/qemu/osdep.h +10 -0
@@ -607,4 +607,14 @@ static inline void qemu_reset_optind(void) #endif } +/** +* qemu_get_host_name: +* @errp: Error object +* +* Operating system agnostic way of querying host name. +* +* Returns allocated hostname (caller should free), NULL on failure. +*/ +char *qemu_get_host_name (Error **errp); +#endif
util/oslib-posix.c +35 -0
@@ -761,3 +761,38 @@ void sigaction_invoke(struct sigaction *action, } action->sa_sigaction (info->ssi_signo, &si,NULL ); } + +#ifndef HOST_NAME_MAX +# ifdef _POSIX_HOST_NAME_MAX +# define HOST_NAME_MAX _POSIX_HOST_NAME_MAX +# else +# define HOST_NAME_MAX 255 +# endif +#endif + +char *qemu_get_host_name (Error **errp) +{ +long len =-1 ; + g_autofree char *hostname = NULL; + +#ifdef _SC_HOST_NAME_MAX + len =sysconf (_SC_HOST_NAME_MAX); +#endif /* _SC_HOST_NAME_MAX */ + +if (len <0 ) { + len =HOST_NAME_MAX ; + } + +/* Unfortunately, gethostname() below does not guarantee a +* NULL terminated string. Therefore, allocate one byte more +* to be sure. */ + hostname =g_new0 (char, len +1 ); + +if (gethostname (hostname, len) <0 ) { +error_setg_errno (errp, errno, +"cannot get hostname" ); +return NULL ; + } + +return g_steal_pointer (&hostname); +}
util/oslib-win32.c +13 -0
@@ -808,3 +808,16 @@ bool qemu_write_pidfile(const char *filename, Error **errp) }return true; } + +char *qemu_get_host_name (Error **errp) +{ +wchar_t tmp[MAX_COMPUTERNAME_LENGTH +1 ]; +DWORD size =G_N_ELEMENTS (tmp); + +if (GetComputerNameW (tmp, &size) ==0 ) { +error_setg_win32 (errp,GetLastError (),"failed close handle" ); +return NULL ; + } + +return g_utf16_to_utf8 (tmp, size,NULL ,NULL ,NULL ); +}
Signature · 1 line
2.26.2
PATCH v3 2/2 qga: Use qemu_get_host_name() instead of g_get_host_name()
In reply to Michal PrivoznikProblem with g_get_host_name() is that on the first call it saves the hostname into a global variable and from then on, every subsequent call returns the saved hostname. Even if the hostname changes. This doesn't play nicely with guest agent, because if the hostname is acquired before the guest is set up (e.g. on the first boot, or before DHCP) we will report old, invalid hostname.
--- qga/commands.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
qga/commands.c +13 -4
@@ -515,11 +515,20 @@ int ga_parse_whence(GuestFileWhence *whence, Error **errp)GuestHostName *qmp_guest_get_host_name (Error **errp) {GuestHostName *result =NULL ; -gchar const *hostname =g_get_host_name (); -if (hostname !=NULL ) { - result =g_new0 (GuestHostName,1 ); - result->host_name =g_strdup (hostname); + g_autofree char *hostname = qemu_get_host_name(errp); + +/* +* We want to avoid using g_get_host_name() because that +* caches the result and we wouldn't reflect changes in the +* host name. +*/ + +if (!hostname) { + hostname =g_strdup ("localhost" ); } + + result =g_new0 (GuestHostName,1 ); + result->host_name =g_steal_pointer (&hostname);return result; }
Signature · 1 line
2.26.2
v3 cover qga: Ditch g_get_host_name()
v3 of:
https://lists.nongnu.org/archive/html/qemu-devel/2020-06/msg06913.html
diff to v2:
- don't leak @hostname in util/oslib-posix.c:qemu_get_host_name()
- document why we are allocating one byte more than needed
- switch to g_new0() from g_malloc0().
Michal Privoznik (2):
util: Introduce qemu_get_host_name()
qga: Use qemu_get_host_name() instead of g_get_host_name()
include/qemu/osdep.h | 10 ++++++++++ qga/commands.c | 17 +++++++++++++---- util/oslib-posix.c | 35 +++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 13 +++++++++++++ 4 files changed, 71 insertions(+), 4 deletions(-)
Signature · 1 line
2.26.2
Re: [PATCH v3 1/2] util: Introduce qemu_get_host_name()
In reply to Michal PrivoznikQuoted 4 lines · Michal Privoznik
This function offers operating system agnostic way to fetch host name. It is implemented for both POSIX-like and Windows systems.
Signed-off-by Michal Privoznik <[email protected]>
Thanks for the updates!
Quoted 90 lines
--- include/qemu/osdep.h | 10 ++++++++++ util/oslib-posix.c | 35 +++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 13 +++++++++++++ 3 files changed, 58 insertions(+)include/qemu/osdep.h +10
-0@@ -607,4 +607,14 @@ static inline void qemu_reset_optind(void) #endif } +/** +* qemu_get_host_name: +* @errp: Error object +* +* Operating system agnostic way of querying host name. +* +* Returns allocated hostname (caller should free), NULL on failure. +*/ +char *qemu_get_host_name (Error **errp); +#endif util/oslib-posix.c +35
-0@@ -761,3 +761,38 @@ void sigaction_invoke(struct sigaction *action, } action->sa_sigaction (info->ssi_signo, &si,NULL ); } + +#ifndef HOST_NAME_MAX +# ifdef _POSIX_HOST_NAME_MAX +# define HOST_NAME_MAX _POSIX_HOST_NAME_MAX +# else +# define HOST_NAME_MAX 255 +# endif +#endif + +char *qemu_get_host_name (Error **errp) +{ +long len =-1 ; + g_autofree char *hostname = NULL; + +#ifdef _SC_HOST_NAME_MAX + len =sysconf (_SC_HOST_NAME_MAX); +#endif /* _SC_HOST_NAME_MAX */ + +if (len <0 ) { + len =HOST_NAME_MAX ; + } + +/* Unfortunately, gethostname() below does not guarantee a +* NULL terminated string. Therefore, allocate one byte more +* to be sure. */ + hostname =g_new0 (char, len +1 ); + +if (gethostname (hostname, len) <0 ) { +error_setg_errno (errp, errno, +"cannot get hostname" ); +return NULL ; + } + +return g_steal_pointer (&hostname); +}util/oslib-win32.c +13
-0@@ -808,3 +808,16 @@ bool qemu_write_pidfile(const char *filename, Error **errp) }return true; } + +char *qemu_get_host_name (Error **errp) +{ +wchar_t tmp[MAX_COMPUTERNAME_LENGTH +1 ]; +DWORD size =G_N_ELEMENTS (tmp); + +if (GetComputerNameW (tmp, &size) ==0 ) { +error_setg_win32 (errp,GetLastError (),"failed close handle" ); +return NULL ; + } + +return g_utf16_to_utf8 (tmp, size,NULL ,NULL ,NULL ); +}
Re: [PATCH v3 1/2] util: Introduce qemu_get_host_name()
In reply to Michal PrivoznikQuoted 9 lines · Michal Privoznik
This function offers operating system agnostic way to fetch host name. It is implemented for both POSIX-like and Windows systems.
Signed-off-by Michal Privoznik <[email protected]>--- include/qemu/osdep.h | 10 ++++++++++ util/oslib-posix.c | 35 +++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 13 +++++++++++++ 3 files changed, 58 insertions(+)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH v3 2/2] qga: Use qemu_get_host_name() instead of g_get_host_name()
In reply to Michal PrivoznikQuoted 7 lines · Michal Privoznik
Problem with
g_get_host_name()is that on the first call it saves the hostname into a global variable and from then on, every subsequent call returns the saved hostname. Even if the hostname changes. This doesn't play nicely with guest agent, because if the hostname is acquired before the guest is set up (e.g. on the first boot, or before DHCP) we will report old, invalid hostname.
Quoted 6 lines
Signed-off-by Michal Privoznik <[email protected]>--- qga/commands.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 13 lines · Michal Privoznik
v3 of:
https://lists.nongnu.org/archive/html/qemu-devel/2020-06/msg06913.html
diff to v2:
- don't leak @hostname in util/oslib-posix.c:qemu_get_host_name()
- document why we are allocating one byte more than needed
- switch tog_new0()fromg_malloc0().Michal Privoznik (2):
util: Introduceqemu_get_host_name()
qga: Useqemu_get_host_name()instead ofg_get_host_name()
Quoted 6 lines
include/qemu/osdep.h | 10 ++++++++++ qga/commands.c | 17 +++++++++++++---- util/oslib-posix.c | 35 +++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 13 +++++++++++++ 4 files changed, 71 insertions(+), 4 deletions(-)
Ping? How can I get these merged please?
Michal
Ping^2?
Quoted 26 lines · Michal Privoznik
Quoted 13 lines · Michal Privoznik
v3 of:
https://lists.nongnu.org/archive/html/qemu-devel/2020-06/msg06913.html
diff to v2:
- don't leak @hostname in util/oslib-posix.c:qemu_get_host_name()
- document why we are allocating one byte more than needed
- switch tog_new0()fromg_malloc0().Michal Privoznik (2):
util: Introduceqemu_get_host_name()
qga: Useqemu_get_host_name()instead ofg_get_host_name()Quoted 6 lines
include/qemu/osdep.h| 10 ++++++++++
qga/commands.c | 17 +++++++++++++---- util/oslib-posix.c | 35 +++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 13 +++++++++++++4 files changed, 71 insertions(+), 4 deletions(-)Ping? How can I get these merged please?
Michal