diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-23 13:15:34 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-23 13:15:34 -0500 |
| commit | a21143486b9c6d7a50b7b62877c02b3c686943cb (patch) | |
| tree | 4bbc889465188e469317bfd89b110a99867a72e8 /net/socket.h | |
| parent | ef6bbdf9e5eb6da5cbdea1bf55e08709c6e181d5 (diff) | |
| parent | 1a0c09583df097d62b0580f9073ba45c9d18351a (diff) | |
| download | focaccia-qemu-a21143486b9c6d7a50b7b62877c02b3c686943cb.tar.gz focaccia-qemu-a21143486b9c6d7a50b7b62877c02b3c686943cb.zip | |
Merge remote-tracking branch 'stefanha/net' into staging
* stefanha/net: remove unused QemuOpts parameter from net init functions convert net_init_bridge() to NetClientOptions convert net_init_tap() to NetClientOptions convert net_init_vde() to NetClientOptions convert net_init_socket() to NetClientOptions convert net_init_slirp() to NetClientOptions convert net_init_dump() to NetClientOptions convert net_init_nic() to NetClientOptions convert net_client_init() to OptsVisitor hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated) qapi schema: add Netdev types qapi schema: remove trailing whitespace qapi: introduce OptsVisitor expose QemuOpt and QemuOpts struct definitions to interested parties qapi: introduce "size" type qapi: generate C types for fixed-width integers qapi: add test case for deallocating traversal of incomplete structure qapi: fix error propagation MAINTAINERS: Replace net maintainer Mark McLoughlin with Stefan Hajnoczi
Diffstat (limited to 'net/socket.h')
| -rw-r--r-- | net/socket.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/socket.h b/net/socket.h index e1fe959412..c4809ad0d9 100644 --- a/net/socket.h +++ b/net/socket.h @@ -25,8 +25,9 @@ #define QEMU_NET_SOCKET_H #include "net.h" -#include "qemu-common.h" +#include "qapi-types.h" -int net_init_socket(QemuOpts *opts, const char *name, VLANState *vlan); +int net_init_socket(const NetClientOptions *opts, const char *name, + VLANState *vlan); #endif /* QEMU_NET_SOCKET_H */ |