Re: [PATCH v2 07/26] tests: make libqmp buildable for win32

[Thomas Huth <thuth@redhat.com>]

On 26/04/2022 12.25, Marc-André Lureau wrote:
> Hi
> 
> On Tue, Apr 26, 2022 at 1:32 PM Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 26/04/2022 11.26, marcandre.lureau@redhat.com wrote:
>>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>>
>>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>>> ---
>>>    tests/qtest/libqmp.h |  2 ++
>>>    tests/qtest/libqmp.c | 37 +++++++++++++++++++++++++++++++------
>>>    2 files changed, 33 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/tests/qtest/libqmp.h b/tests/qtest/libqmp.h
>>> index 94aa97328a17..772f18b73ba3 100644
>>> --- a/tests/qtest/libqmp.h
>>> +++ b/tests/qtest/libqmp.h
>>> @@ -20,8 +20,10 @@
>>>    #include "qapi/qmp/qdict.h"
>>>
>>>    QDict *qmp_fd_receive(int fd);
>>> +#ifndef G_OS_WIN32
>>>    void qmp_fd_vsend_fds(int fd, int *fds, size_t fds_num,
>>>                          const char *fmt, va_list ap) G_GNUC_PRINTF(4, 0);
>>> +#endif
>>>    void qmp_fd_vsend(int fd, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0);
>>>    void qmp_fd_send(int fd, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
>>>    void qmp_fd_send_raw(int fd, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
>>> diff --git a/tests/qtest/libqmp.c b/tests/qtest/libqmp.c
>>> index 0358b8313dc4..5f451ebee796 100644
>>> --- a/tests/qtest/libqmp.c
>>> +++ b/tests/qtest/libqmp.c
>>> @@ -15,9 +15,15 @@
>>>     */
>>>
>>>    #include "qemu/osdep.h"
>>> -
>>>    #include "libqmp.h"
>>>
>>> +#include <unistd.h>
>>> +#include <stdlib.h>
>>
>> unistd.h and stdlib.h should have been added by osdep.h already, so please
>> remove these two lines.
> 
> Right  (it will be part of the follow-up series, moving it to a
> standalone project). Ack with that?

Sure, the two headers should then be added in the patch where you remove 
osdep.h.

  Thomas