configure / util: Auto-detect the availability of openpty()

[PATCH] configure / util: Auto-detect the availability of openpty()

Posted by Thomas Huth 3 years, 9 months ago

Recent versions of Solaris (v11.4) now feature an openpty() function,
too, causing a build failure since we ship our own implementation of
openpty() for Solaris in util/qemu-openpty.c so far. Since there are
now both variants available in the wild, with and without this function,
let's introduce a proper HAVE_OPENPTY define for this to fix the build
failure.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Note: Untested, since I do not have a VM with Solaris. Michele,
 Peter, I'd really appreciate a "Tested-by:" from you here. Thanks!

 configure           | 9 ++++++++-
 util/qemu-openpty.c | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 4a22dcd563..0b5fd30fc4 100755
--- a/configure
+++ b/configure
@@ -5134,10 +5134,14 @@ extern int openpty(int *am, int *as, char *name, void *termp, void *winp);
 int main(void) { return openpty(0, 0, 0, 0, 0); }
 EOF
 
-if ! compile_prog "" "" ; then
+have_openpty="no"
+if compile_prog "" "" ; then
+  have_openpty="yes"
+else
   if compile_prog "" "-lutil" ; then
     libs_softmmu="-lutil $libs_softmmu"
     libs_tools="-lutil $libs_tools"
+    have_openpty="yes"
   fi
 fi
 
@@ -7380,6 +7384,9 @@ fi
 if test "$have_broken_size_max" = "yes" ; then
     echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak
 fi
+if test "$have_openpty" = "yes" ; then
+    echo "HAVE_OPENPTY=y" >> $config_host_mak
+fi
 
 # Work around a system header bug with some kernel/XFS header
 # versions where they both try to define 'struct fsxattr':
diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
index 2e8b43bdf5..14e5c8ae8f 100644
--- a/util/qemu-openpty.c
+++ b/util/qemu-openpty.c
@@ -52,7 +52,8 @@
 #endif
 
 #ifdef __sun__
-/* Once Solaris has openpty(), this is going to be removed. */
+
+#if !defined(HAVE_OPENPTY)
 static int openpty(int *amaster, int *aslave, char *name,
                    struct termios *termp, struct winsize *winp)
 {
@@ -93,6 +94,7 @@ err:
         close(mfd);
         return -1;
 }
+#endif
 
 static void cfmakeraw (struct termios *termios_p)
 {
-- 
2.18.1

Re: [PATCH] configure / util: Auto-detect the availability of openpty()

Posted by Michele Denber 3 years, 9 months ago


On 07/02/20 10:39, Thomas Huth wrote:
> Recent versions of Solaris (v11.4) now feature an openpty() function,
> too, causing a build failure since we ship our own implementation of
> openpty() for Solaris in util/qemu-openpty.c so far. Since there are
> now both variants available in the wild, with and without this function,
> let's introduce a proper HAVE_OPENPTY define for this to fix the build
> failure.
>
> Signed-off-by: Thomas Huth<thuth@redhat.com>
> ---
>   Note: Untested, since I do not have a VM with Solaris. Michele,
>   Peter, I'd really appreciate a "Tested-by:" from you here. Thanks!
Sorry, I was off on another project (doing my taxes).  Is this patch 
missing something?  It looks like there should be more.  The last line is

static void cfmakeraw (struct termios *termios_p) {

with no matching "}".


			- Michele

>
>   configure           | 9 ++++++++-
>   util/qemu-openpty.c | 4 +++-
>   2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 4a22dcd563..0b5fd30fc4 100755
> --- a/configure
> +++ b/configure
> @@ -5134,10 +5134,14 @@ extern int openpty(int *am, int *as, char *name, void *termp, void *winp);
>   int main(void) { return openpty(0, 0, 0, 0, 0); }
>   EOF
>
> -if ! compile_prog "" "" ; then
> +have_openpty="no"
> +if compile_prog "" "" ; then
> +  have_openpty="yes"
> +else
>     if compile_prog "" "-lutil" ; then
>       libs_softmmu="-lutil $libs_softmmu"
>       libs_tools="-lutil $libs_tools"
> +    have_openpty="yes"
>     fi
>   fi
>
> @@ -7380,6 +7384,9 @@ fi
>   if test "$have_broken_size_max" = "yes" ; then
>       echo "HAVE_BROKEN_SIZE_MAX=y">>  $config_host_mak
>   fi
> +if test "$have_openpty" = "yes" ; then
> +    echo "HAVE_OPENPTY=y">>  $config_host_mak
> +fi
>
>   # Work around a system header bug with some kernel/XFS header
>   # versions where they both try to define 'struct fsxattr':
> diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
> index 2e8b43bdf5..14e5c8ae8f 100644
> --- a/util/qemu-openpty.c
> +++ b/util/qemu-openpty.c
> @@ -52,7 +52,8 @@
>   #endif
>
>   #ifdef __sun__
> -/* Once Solaris has openpty(), this is going to be removed. */
> +
> +#if !defined(HAVE_OPENPTY)
>   static int openpty(int *amaster, int *aslave, char *name,
>                      struct termios *termp, struct winsize *winp)
>   {
> @@ -93,6 +94,7 @@ err:
>           close(mfd);
>           return -1;
>   }
> +#endif
>
>   static void cfmakeraw (struct termios *termios_p)
>   {

Re: [PATCH] configure / util: Auto-detect the availability of openpty()

Posted by Thomas Huth 3 years, 9 months ago

On 02/07/2020 18.13, Michele Denber wrote:
> 
> 
> On 07/02/20 10:39, Thomas Huth wrote:
>> Recent versions of Solaris (v11.4) now feature an openpty() function,
>> too, causing a build failure since we ship our own implementation of
>> openpty() for Solaris in util/qemu-openpty.c so far. Since there are
>> now both variants available in the wild, with and without this function,
>> let's introduce a proper HAVE_OPENPTY define for this to fix the build
>> failure.
>>
>> Signed-off-by: Thomas Huth<thuth@redhat.com>
>> ---
>>   Note: Untested, since I do not have a VM with Solaris. Michele,
>>   Peter, I'd really appreciate a "Tested-by:" from you here. Thanks!
> Sorry, I was off on another project (doing my taxes).  Is this patch 
> missing something?  It looks like there should be more.  The last line is
> 
> static void cfmakeraw (struct termios *termios_p) {
> 
> with no matching "}".

That's just the context, cut at three lines after the last change. 
Simply try to apply the patch with "patch -p1 -i ..." or "git am" in a 
separate git branch if you're using git. It should hopefully apply cleanly.

  Thomas

Re: [PATCH] configure / util: Auto-detect the availability of openpty()

Posted by Michele Denber 3 years, 9 months ago

On 07/02/20 13:34, Thomas Huth wrote:
>
> That's just the context, cut at three lines after the last change. 
> Simply try to apply the patch with "patch -p1 -i ..." or "git am" in a 
> separate git branch if you're using git. It should hopefully apply 
> cleanly.

Looks like it partly worked:

root@hemlock:~/qemu-5.0.0# gpatch -p1 -i < configpatch.diff
gpatch: option requires an argument -- 'i'
gpatch: Try 'gpatch --help' for more information.
root@hemlock:~/qemu-5.0.0# gpatch -p1 < configpatch.diff
patching file configure
Hunk #1 succeeded at 5049 (offset -85 lines).
Hunk #2 succeeded at 7117 (offset -267 lines).
patching file util/qemu-openpty.c
Hunk #1 FAILED at 52.
Hunk #2 succeeded at 95 with fuzz 2 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file util/qemu-openpty.c.rej
root@hemlock:~/qemu-5.0.0# cat util/qemu-openpty.c.rej
--- util/qemu-openpty.c
+++ util/qemu-openpty.c
@@ -52,7 +52,8 @@
  #endif

  #ifdef __sun__
-/* Once Solaris has openpty(), this is going to be removed. */
+
+#if !defined(HAVE_OPENPTY)
  static int openpty(int *amaster, int *aslave, char *name,
                     struct termios *termp, struct winsize *winp)
  {
root@hemlock:~/qemu-5.0.0#


             - Michele

Re: [PATCH] configure / util: Auto-detect the availability of openpty()

Posted by Thomas Huth 3 years, 9 months ago

On 02/07/2020 23.33, Michele Denber wrote:
> On 07/02/20 13:34, Thomas Huth wrote:
>>
>> That's just the context, cut at three lines after the last change. 
>> Simply try to apply the patch with "patch -p1 -i ..." or "git am" in a 
>> separate git branch if you're using git. It should hopefully apply 
>> cleanly.
> 
> Looks like it partly worked:
> 
> root@hemlock:~/qemu-5.0.0# gpatch -p1 -i < configpatch.diff
> gpatch: option requires an argument -- 'i'
> gpatch: Try 'gpatch --help' for more information.
> root@hemlock:~/qemu-5.0.0# gpatch -p1 < configpatch.diff
> patching file configure
> Hunk #1 succeeded at 5049 (offset -85 lines).
> Hunk #2 succeeded at 7117 (offset -267 lines).
> patching file util/qemu-openpty.c
> Hunk #1 FAILED at 52.
> Hunk #2 succeeded at 95 with fuzz 2 (offset 2 lines).
> 1 out of 2 hunks FAILED -- saving rejects to file util/qemu-openpty.c.rej
> root@hemlock:~/qemu-5.0.0# cat util/qemu-openpty.c.rej
> --- util/qemu-openpty.c
> +++ util/qemu-openpty.c
> @@ -52,7 +52,8 @@
>   #endif
> 
>   #ifdef __sun__
> -/* Once Solaris has openpty(), this is going to be removed. */
> +
> +#if !defined(HAVE_OPENPTY)
>   static int openpty(int *amaster, int *aslave, char *name,
>                      struct termios *termp, struct winsize *winp)

Did you have a local modification to that file? If so, please revert it 
first before applying the patch (or add the "#if !defined(HAVE_OPENPTY)" 
now manually to see whether it works).

  Thanks,
   Thomas

Re: [PATCH] configure / util: Auto-detect the availability of openpty()

Posted by Michele Denber 3 years, 9 months ago

Oops, I hit Send before I was done.  I tried  the Haiku patch:

diff --git a/util/Makefile.objs b/util/Makefile.objs
index cc5e37177a..faebc13fac 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -39,7 +39,7 @@ util-obj-y += qsp.o
  util-obj-y += range.o
  util-obj-y += stats64.o
  util-obj-y += systemd.o
-util-obj-$(CONFIG_POSIX) += drm.o
+util-obj-$(CONFIG_LINUX) += drm.o
  util-obj-y += guest-random.o
  util-obj-$(CONFIG_GIO) += dbus.o
  dbus.o-cflags = $(GIO_CFLAGS)

but it didn't work:

root@hemlock:~/qemu-5.0.0# gpatch -p1 < Makefile.objs.patch.diff
patching file util/Makefile.objs
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file util/Makefile.objs.rej
root@hemlock:~/qemu-5.0.0# cat util/Makefile.objs.rej
--- util/Makefile.objs
+++ util/Makefile.objs
@@ -39,7 +39,7 @@ util-obj-y += qsp.o
  util-obj-y += range.o
  util-obj-y += stats64.o
  util-obj-y += systemd.o
-util-obj-$(CONFIG_POSIX) += drm.o
+util-obj-$(CONFIG_LINUX) += drm.o
  util-obj-y += guest-random.o
  util-obj-$(CONFIG_GIO) += dbus.o
  dbus.o-cflags = $(GIO_CFLAGS)
root@hemlock:~/qemu-5.0.0#

             - Michele

Re: [PATCH] configure / util: Auto-detect the availability of openpty()

Posted by Peter Maydell 3 years, 9 months ago

On Fri, 3 Jul 2020 at 17:38, Michele Denber <denber@mindspring.com> wrote:
>
> Oops, I hit Send before I was done.  I tried  the Haiku patch:
>
> diff --git a/util/Makefile.objs b/util/Makefile.objs
> index cc5e37177a..faebc13fac 100644
> --- a/util/Makefile.objs
> +++ b/util/Makefile.objs
> @@ -39,7 +39,7 @@ util-obj-y += qsp.o
>  util-obj-y += range.o
>  util-obj-y += stats64.o
>  util-obj-y += systemd.o
> -util-obj-$(CONFIG_POSIX) += drm.o
> +util-obj-$(CONFIG_LINUX) += drm.o
>  util-obj-y += guest-random.o
>  util-obj-$(CONFIG_GIO) += dbus.o
>  dbus.o-cflags = $(GIO_CFLAGS)
>
> but it didn't work:
>
> root@hemlock:~/qemu-5.0.0# gpatch -p1 < Makefile.objs.patch.diff
> patching file util/Makefile.objs
> Hunk #1 FAILED at 39.
> 1 out of 1 hunk FAILED -- saving rejects to file util/Makefile.objs.rej

This is because you're trying to apply the patch to the
5.0.0 release, but it was made against the current head-of-git,
and this file has changed a little between the two.
Generally we do all development against head-of-git, so
I would suggest that you try again with that.

As it happens, the current preferred fix for the drm.c issue
is this one:
https://patchew.org/QEMU/20200703145614.16684-1-peter.maydell@linaro.org/20200703145614.16684-10-peter.maydell@linaro.org/

thanks
-- PMM

gmake in Solaris 11.4: _IOR missing

Posted by Michele Denber 3 years, 9 months ago

On 07/03/20 12:50, Peter Maydell wrote:
> ...
> This is because you're trying to apply the patch to the
> 5.0.0 release, but it was made against the current head-of-git,
> and this file has changed a little between the two.
> Generally we do all development against head-of-git, so
> I would suggest that you try again with that.
>
> As it happens, the current preferred fix for the drm.c issue
> is this one:
> https://patchew.org/QEMU/20200703145614.16684-1-peter.maydell@linaro.org/20200703145614.16684-10-peter.maydell@linaro.org/
I see.  I downloaded 5.0.0 mainly because I don't understand how git 
works.  Anyway, I applied your new  patch and it worked.

I tried gmake again and got further.  This time it's stopping here:

root@hemlock:~/qemu-5.0.0# gmake -j16
...
CC      hw/usb/hcd-uhci.o
In file included from hw/tpm/tpm_emulator.c:37:0:
hw/tpm/tpm_ioctl.h:222:30: warning: implicit declaration of function 
'_IOR\'; did you mean '_IORW'? [-Wimplicit-function-declaration]
      PTM_GET_CAPABILITY     = _IOR('P', 0, ptm_cap),
                               ^~~~
                               _IORW
hw/tpm/tpm_ioctl.h:222:43: error: expected expression before 
\u2018ptm_cap\u2019
      PTM_GET_CAPABILITY     = _IOR('P', 0, ptm_cap),
                                            ^~~~~~~
hw/tpm/tpm_ioctl.h:223:30: warning: implicit declaration of function 
\u2018_IOWR\u2019; did you mean \u2018_IOWRT\u2019? 
[-Wimplicit-function-declaration]
      PTM_INIT               = _IOWR('P', 1, ptm_init),
                               ^~~~~
                               _IOWRT
hw/tpm/tpm_ioctl.h:223:44: error: expected expression before 
\u2018ptm_init\u2019
      PTM_INIT               = _IOWR('P', 1, ptm_init),
                                             ^~~~~~~~
hw/tpm/tpm_ioctl.h:224:43: error: expected expression before 
\u2018ptm_res\u2019
      PTM_SHUTDOWN           = _IOR('P', 2, ptm_res),
                                            ^~~~~~~
hw/tpm/tpm_ioctl.h:225:43: error: expected expression before 
\u2018ptm_est\u2019
      PTM_GET_TPMESTABLISHED = _IOR('P', 3, ptm_est),
                                            ^~~~~~~
hw/tpm/tpm_ioctl.h:226:44: error: expected expression before 
\u2018ptm_loc\u2019
      PTM_SET_LOCALITY       = _IOWR('P', 4, ptm_loc),
                                             ^~~~~~~
hw/tpm/tpm_ioctl.h:227:43: error: expected expression before 
\u2018ptm_res\u2019
      PTM_HASH_START         = _IOR('P', 5, ptm_res),
                                            ^~~~~~~
hw/tpm/tpm_ioctl.h:228:44: error: expected expression before 
\u2018ptm_hdata\u2019
      PTM_HASH_DATA          = _IOWR('P', 6, ptm_hdata),
                                             ^~~~~~~~~
hw/tpm/tpm_ioctl.h:229:43: error: expected expression before 
\u2018ptm_res\u2019
      PTM_HASH_END           = _IOR('P', 7, ptm_res),
                                            ^~~~~~~
hw/tpm/tpm_ioctl.h:230:43: error: expected expression before 
\u2018ptm_res\u2019
      PTM_CANCEL_TPM_CMD     = _IOR('P', 8, ptm_res),
                                            ^~~~~~~
hw/tpm/tpm_ioctl.h:231:43: error: expected expression before 
\u2018ptm_res\u2019
      PTM_STORE_VOLATILE     = _IOR('P', 9, ptm_res),
                                            ^~~~~~~
hw/tpm/tpm_ioctl.h:232:47: error: expected expression before 
\u2018ptm_reset_est\u2019
      PTM_RESET_TPMESTABLISHED = _IOWR('P', 10, ptm_reset_est),
                                                ^~~~~~~~~~~~~
hw/tpm/tpm_ioctl.h:233:45: error: expected expression before 
\u2018ptm_getstate\u2019
      PTM_GET_STATEBLOB      = _IOWR('P', 11, ptm_getstate),
                                              ^~~~~~~~~~~~
hw/tpm/tpm_ioctl.h:234:45: error: expected expression before 
\u2018ptm_setstate\u2019
      PTM_SET_STATEBLOB      = _IOWR('P', 12, ptm_setstate),
                                              ^~~~~~~~~~~~
   CC      hw/usb/hcd-ohci.o
hw/tpm/tpm_ioctl.h:235:44: error: expected expression before 
\u2018ptm_res\u2019
      PTM_STOP               = _IOR('P', 13, ptm_res),
                                             ^~~~~~~
hw/tpm/tpm_ioctl.h:236:44: error: expected expression before 
\u2018ptm_getconfig\u2019
      PTM_GET_CONFIG         = _IOR('P', 14, ptm_getconfig),
                                             ^~~~~~~~~~~~~
hw/tpm/tpm_ioctl.h:237:44: error: expected expression before 
\u2018ptm_res\u2019
      PTM_SET_DATAFD         = _IOR('P', 15, ptm_res),
                                             ^~~~~~~
hw/tpm/tpm_ioctl.h:238:45: error: expected expression before 
\u2018ptm_setbuffersize\u2019
      PTM_SET_BUFFERSIZE     = _IOWR('P', 16, ptm_setbuffersize),
                                              ^~~~~~~~~~~~~~~~~
   CC      hw/usb/hcd-ohci-pci.o
gmake: *** [/export/home/denber/qemu-5.0.0/rules.mak:69: 
hw/tpm/tpm_emulator.o] Error 1

It appears that _IOR & friends are defined in /usr/include/sys/ioccom.h, 
but I can't figure out how to point gmake to that.  Do I need some sort 
of "-I" in the Makefile?


When I built QEMU 2.12, I ran into this too and ended up just commenting 
out all the references to _IOR, etc. in hw/tpm/tpm_ioctl.h but maybe we 
can do something more elegant this time.  Thanks.

             - Michele

gmake in Solaris 11.4: TFR missing

Posted by Michele Denber 3 years, 9 months ago

>
> It appears that _IOR & friends are defined in 
> /usr/include/sys/ioccom.h, but I can't figure out how to point gmake 
> to that.  Do I need some sort of "-I" in the Makefile?
>
>
> When I built QEMU 2.12, I ran into this too and ended up just 
> commenting out all the references to _IOR, etc. in hw/tpm/tpm_ioctl.h 
> but maybe we can do something more elegant this time.  Thanks.

OK, I fixed this by adding the line

#include </usr/include/sys/ioccom.h>

to hw/tpm/tpm_ioctl.h.

gmake now went to the end but threw a bunch of errors all complaining 
about something called TFR.  This is the tail:

  ...
CC      aarch64-softmmu/trace/generated-helpers.o
Undefined                       first referenced
  symbol                             in file
TFR                                 ../net/tap-solaris.o
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[1]: *** [Makefile:208: qemu-system-mipsel] Error 1
gmake: *** [Makefile:527: mipsel-softmmu/all] Error 2
   LINK    mips-softmmu/qemu-system-mips
Undefined                       first referenced
  symbol                             in file
TFR                                 ../net/tap-solaris.o
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[1]: *** [Makefile:208: qemu-system-mips] Error 1
gmake: *** [Makefile:527: mips-softmmu/all] Error 2
   LINK    arm-softmmu/qemu-system-arm
Undefined                       first referenced
  symbol                             in file
TFR                                 ../net/tap-solaris.o
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[1]: *** [Makefile:208: qemu-system-arm] Error 1
gmake: *** [Makefile:527: arm-softmmu/all] Error 2
   LINK    aarch64-softmmu/qemu-system-aarch64
Undefined                       first referenced
  symbol                             in file
TFR                                 ../net/tap-solaris.o
ld: fatal: symbol referencing errors
collect2: error: ld returned 1 exit status
gmake[1]: *** [Makefile:208: qemu-system-aarch64] Error 1
gmake: *** [Makefile:527: aarch64-softmmu/all] Error 2
root@hemlock:~/qemu-5.0.0#

A web search for "solaris undefined symbol TFR" turned up nothing and 
I'm not seeing it on the machine.  man TFR returns nothing.  I didn't 
encounter this error while building 2.12.  Here's an example of its use 
(in tap-solaris.c):

  TFR(ip_fd = open("/dev/udp", O_RDWR, 0));

   What is TFR?

             - Michele