Commit e47f81b6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging 



More work towards libslirp

Marc-André Lureau (27):
  slirp: generalize guestfwd with a callback based approach
  net/slirp: simplify checking for cmd: prefix
  net/slirp: free forwarding rules on cleanup
  net/slirp: fix leaks on forwarding rule registration error
  slirp: add callbacks for timer
  slirp: replace trace functions with DEBUG calls
  slirp: replace QEMU_PACKED with SLIRP_PACKED
  slirp: replace most qemu socket utilities with slirp own version
  slirp: replace qemu_set_nonblock()
  slirp: add unregister_poll_fd() callback
  slirp: replace qemu_notify_event() with a callback
  slirp: move QEMU state saving to a separate unit
  slirp: do not include qemu headers in libslirp.h public API header
  slirp: improve windows headers inclusion
  slirp: add slirp own version of pstrcpy
  slirp: remove qemu timer.h dependency
  slirp: remove now useless QEMU headers inclusions
  slirp: replace net/eth.h inclusion with own defines
  slirp: replace qemu qtailq with slirp own copy
  slirp: replace remaining qemu headers dependency
  slirp: prefer c99 types over BSD kind
  slirp: improve send_packet() callback
  slirp: replace global polling with per-instance & notifier
  slirp: remove slirp_instances list
  slirp: use polling callbacks, drop glib requirement
  slirp: pass opaque to all callbacks
  slirp: API is extern C

Peter Maydell (2):
  slirp: Avoid marking naturally packed structs as QEMU_PACKED
  slirp: Don't mark struct ipq or struct ipasfrag as packed

Samuel Thibault (3):
  slirp: Avoid unaligned 16bit memory access
  slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
  slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/

# gpg: Signature made Thu 07 Feb 2019 14:02:41 GMT
# gpg:                using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: E61D BB15 D417 2BDE C97E  92D9 DB55 0E89 F0FA 54F3

* remotes/thibault/tags/samuel-thibault: (32 commits)
  slirp: API is extern C
  slirp: pass opaque to all callbacks
  slirp: use polling callbacks, drop glib requirement
  slirp: remove slirp_instances list
  slirp: replace global polling with per-instance & notifier
  slirp: improve send_packet() callback
  slirp: prefer c99 types over BSD kind
  slirp: replace remaining qemu headers dependency
  slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/
  slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
  slirp: replace qemu qtailq with slirp own copy
  slirp: replace net/eth.h inclusion with own defines
  slirp: remove now useless QEMU headers inclusions
  slirp: remove qemu timer.h dependency
  slirp: add slirp own version of pstrcpy
  slirp: improve windows headers inclusion
  slirp: do not include qemu headers in libslirp.h public API header
  slirp: move QEMU state saving to a separate unit
  slirp: replace qemu_notify_event() with a callback
  slirp: add unregister_poll_fd() callback
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ff372bb5 ee261c02

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ trace-events-subdirs += net 
trace-events-subdirs += qapi

trace-events-subdirs += qom

trace-events-subdirs += scsi

trace-events-subdirs += slirp

trace-events-subdirs += target/arm

trace-events-subdirs += target/i386

trace-events-subdirs += target/mips

include/glib-compat.h

+0 −57
Original line number Diff line number Diff line
@@ -83,63 +83,6 @@ static inline gboolean g_strv_contains_qemu(const gchar *const *strv, 
}

#define g_strv_contains(a, b) g_strv_contains_qemu(a, b)



#if !GLIB_CHECK_VERSION(2, 58, 0)

typedef struct QemuGSpawnFds {

    GSpawnChildSetupFunc child_setup;

    gpointer user_data;

    gint stdin_fd;

    gint stdout_fd;

    gint stderr_fd;

} QemuGSpawnFds;



static inline void

qemu_gspawn_fds_setup(gpointer user_data)

{

    QemuGSpawnFds *q = (QemuGSpawnFds *)user_data;



    dup2(q->stdin_fd, 0);

    dup2(q->stdout_fd, 1);

    dup2(q->stderr_fd, 2);

    q->child_setup(q->user_data);

}

#endif



static inline gboolean

g_spawn_async_with_fds_qemu(const gchar *working_directory,

                            gchar **argv,

                            gchar **envp,

                            GSpawnFlags flags,

                            GSpawnChildSetupFunc child_setup,

                            gpointer user_data,

                            GPid *child_pid,

                            gint stdin_fd,

                            gint stdout_fd,

                            gint stderr_fd,

                            GError **error)

{

#if GLIB_CHECK_VERSION(2, 58, 0)

    return g_spawn_async_with_fds(working_directory, argv, envp, flags,

                                  child_setup, user_data,

                                  child_pid, stdin_fd, stdout_fd, stderr_fd,

                                  error);

#else

    QemuGSpawnFds setup = {

        .child_setup = child_setup,

        .user_data = user_data,

        .stdin_fd = stdin_fd,

        .stdout_fd = stdout_fd,

        .stderr_fd = stderr_fd,

    };



    return g_spawn_async(working_directory, argv, envp, flags,

                         qemu_gspawn_fds_setup, &setup,

                         child_pid, error);

#endif

}



#define g_spawn_async_with_fds(wd, argv, env, f, c, d, p, ifd, ofd, efd, err) \

    g_spawn_async_with_fds_qemu(wd, argv, env, f, c, d, p, ifd, ofd, efd, err)



#if defined(_WIN32) && !GLIB_CHECK_VERSION(2, 50, 0)

/*

 * g_poll has a problem on Windows when using

include/net/net.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ ssize_t qemu_sendv_packet(NetClientState *nc, const struct iovec *iov, 
                          int iovcnt);

ssize_t qemu_sendv_packet_async(NetClientState *nc, const struct iovec *iov,

                                int iovcnt, NetPacketSent *sent_cb);

void qemu_send_packet(NetClientState *nc, const uint8_t *buf, int size);

ssize_t qemu_send_packet(NetClientState *nc, const uint8_t *buf, int size);

ssize_t qemu_send_packet_raw(NetClientState *nc, const uint8_t *buf, int size);

ssize_t qemu_send_packet_async(NetClientState *nc, const uint8_t *buf,

                               int size, NetPacketSent *sent_cb);

include/qemu/main-loop.h

+15 −0
Original line number Diff line number Diff line
@@ -302,4 +302,19 @@ void qemu_fd_register(int fd); 
QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);

void qemu_bh_schedule_idle(QEMUBH *bh);



enum {

    MAIN_LOOP_POLL_FILL,

    MAIN_LOOP_POLL_ERR,

    MAIN_LOOP_POLL_OK,

};



typedef struct MainLoopPoll {

    int state;

    uint32_t timeout;

    GArray *pollfds;

} MainLoopPoll;



void main_loop_poll_add_notifier(Notifier *notify);

void main_loop_poll_remove_notifier(Notifier *notify);



#endif

net/net.c

+2 −2
Original line number Diff line number Diff line
@@ -668,9 +668,9 @@ ssize_t qemu_send_packet_async(NetClientState *sender, 
                                             buf, size, sent_cb);

}



void qemu_send_packet(NetClientState *nc, const uint8_t *buf, int size)

ssize_t qemu_send_packet(NetClientState *nc, const uint8_t *buf, int size)

{

    qemu_send_packet_async(nc, buf, size, NULL);

    return qemu_send_packet_async(nc, buf, size, NULL);

}



ssize_t qemu_send_packet_raw(NetClientState *nc, const uint8_t *buf, int size)