Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
net
/
socket.c
diff --git
a/qemu/net/socket.c
b/qemu/net/socket.c
index
b1e3b1c
..
9fa2cd8
100644
(file)
--- a/
qemu/net/socket.c
+++ b/
qemu/net/socket.c
@@
-21,11
+21,12
@@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "
config-host
.h"
+#include "
qemu/osdep
.h"
#include "net/net.h"
#include "clients.h"
#include "monitor/monitor.h"
#include "net/net.h"
#include "clients.h"
#include "monitor/monitor.h"
+#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
@@
-145,15
+146,14
@@
static void net_socket_send_completed(NetClientState *nc, ssize_t len)
static void net_socket_send(void *opaque)
{
NetSocketState *s = opaque;
static void net_socket_send(void *opaque)
{
NetSocketState *s = opaque;
- int size
, err
;
+ int size;
unsigned l;
uint8_t buf1[NET_BUFSIZE];
const uint8_t *buf;
size = qemu_recv(s->fd, buf1, sizeof(buf1), 0);
if (size < 0) {
unsigned l;
uint8_t buf1[NET_BUFSIZE];
const uint8_t *buf;
size = qemu_recv(s->fd, buf1, sizeof(buf1), 0);
if (size < 0) {
- err = socket_error();
- if (err != EWOULDBLOCK)
+ if (errno != EWOULDBLOCK)
goto eoc;
} else if (size == 0) {
/* end of connection */
goto eoc;
} else if (size == 0) {
/* end of connection */
@@
-566,7
+566,7
@@
static int net_socket_connect_init(NetClientState *peer,
const char *host_str)
{
NetSocketState *s;
const char *host_str)
{
NetSocketState *s;
- int fd, connected, ret
, err
;
+ int fd, connected, ret;
struct sockaddr_in saddr;
if (parse_host_port(&saddr, host_str) < 0)
struct sockaddr_in saddr;
if (parse_host_port(&saddr, host_str) < 0)
@@
-583,14
+583,12
@@
static int net_socket_connect_init(NetClientState *peer,
for(;;) {
ret = connect(fd, (struct sockaddr *)&saddr, sizeof(saddr));
if (ret < 0) {
for(;;) {
ret = connect(fd, (struct sockaddr *)&saddr, sizeof(saddr));
if (ret < 0) {
- err = socket_error();
- if (err == EINTR || err == EWOULDBLOCK) {
- } else if (err == EINPROGRESS) {
- break;
-#ifdef _WIN32
- } else if (err == WSAEALREADY || err == WSAEINVAL) {
+ if (errno == EINTR || errno == EWOULDBLOCK) {
+ /* continue */
+ } else if (errno == EINPROGRESS ||
+ errno == EALREADY ||
+ errno == EINVAL) {
break;
break;
-#endif
} else {
perror("connect");
closesocket(fd);
} else {
perror("connect");
closesocket(fd);
@@
-706,8
+704,8
@@
int net_init_socket(const NetClientOptions *opts, const char *name,
Error *err = NULL;
const NetdevSocketOptions *sock;
Error *err = NULL;
const NetdevSocketOptions *sock;
- assert(opts->
kind
== NET_CLIENT_OPTIONS_KIND_SOCKET);
- sock = opts->
socket
;
+ assert(opts->
type
== NET_CLIENT_OPTIONS_KIND_SOCKET);
+ sock = opts->
u.socket.data
;
if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast +
sock->has_udp != 1) {
if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast +
sock->has_udp != 1) {