diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-09-17 18:43:51 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2012-10-08 13:59:40 +0200 |
| commit | a245fc18352fe286ba45ae0661a73b3841514889 (patch) | |
| tree | 0689faf6acf243cc360eb2ca1b31c89ce79cbcd0 /net/socket.h | |
| parent | 9899148110627da388f82c02997bca6d678d1aa1 (diff) | |
| download | qemu-a245fc18352fe286ba45ae0661a73b3841514889.zip qemu-a245fc18352fe286ba45ae0661a73b3841514889.tar.gz qemu-a245fc18352fe286ba45ae0661a73b3841514889.tar.bz2 | |
net: consolidate NetClientState header files into one
This patch doesn't seem much useful alone, I must admit. However,
it makes sense as part of the upcoming directory reorganization,
where I want to have include/net/tap.h as the net<->hw interface
for tap. Then having both net/tap.h and include/net/tap.h does
not work. "Fixed" by moving all the init functions to a single
header file net/clients.h.
The patch also adopts a uniform style for including net/*.h files
from net/*.c, without the net/ path.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Diffstat (limited to 'net/socket.h')
| -rw-r--r-- | net/socket.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/net/socket.h b/net/socket.h deleted file mode 100644 index 3f8a092..0000000 --- a/net/socket.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * QEMU System Emulator - * - * Copyright (c) 2003-2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -#ifndef QEMU_NET_SOCKET_H -#define QEMU_NET_SOCKET_H - -#include "net.h" -#include "qapi-types.h" - -int net_init_socket(const NetClientOptions *opts, const char *name, - NetClientState *peer); - -#endif /* QEMU_NET_SOCKET_H */ |