diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/misc/xencons | 3 | ||||
| -rw-r--r-- | tools/xenctl/lib/console_client.py | 3 | ||||
| -rw-r--r-- | tools/xend/lib/console.py | 5 | ||||
| -rw-r--r-- | tools/xend/lib/domain_controller.h | 9 | ||||
| -rw-r--r-- | tools/xend/lib/manager.py | 2 |
5 files changed, 7 insertions, 15 deletions
diff --git a/tools/misc/xencons b/tools/misc/xencons index 31c87a1ed7..7ac63aeb75 100755 --- a/tools/misc/xencons +++ b/tools/misc/xencons @@ -49,9 +49,6 @@ def __send_to_sock(sock): def connect(host,port): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, - struct.pack('ii', 0, 0)) sock.connect((host,port)) oattrs = tcgetattr(0) diff --git a/tools/xenctl/lib/console_client.py b/tools/xenctl/lib/console_client.py index 31c87a1ed7..7ac63aeb75 100644 --- a/tools/xenctl/lib/console_client.py +++ b/tools/xenctl/lib/console_client.py @@ -49,9 +49,6 @@ def __send_to_sock(sock): def connect(host,port): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, - struct.pack('ii', 0, 0)) sock.connect((host,port)) oattrs = tcgetattr(0) diff --git a/tools/xend/lib/console.py b/tools/xend/lib/console.py index 1b2874c696..aad6069979 100644 --- a/tools/xend/lib/console.py +++ b/tools/xend/lib/console.py @@ -75,8 +75,6 @@ class interface: # Turn the new socket into a non-blocking listener. self.sock.setblocking(False) self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, - struct.pack('ii', 0, 0)) self.sock.bind(('', self.port)) self.sock.listen(1) @@ -99,8 +97,7 @@ class interface: except: return 0 sock.setblocking(False) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, - struct.pack('ii', 0, 0)) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) # Close the listening socket. self.sock.close() diff --git a/tools/xend/lib/domain_controller.h b/tools/xend/lib/domain_controller.h index 6a49630113..14f970dd04 100644 --- a/tools/xend/lib/domain_controller.h +++ b/tools/xend/lib/domain_controller.h @@ -75,9 +75,10 @@ typedef struct { * Message request/response defintions for block-device messages. */ -typedef u16 blkif_vdev_t; -typedef u16 blkif_pdev_t; -typedef u64 blkif_sector_t; +#define blkif_vdev_t u16 +#define blkif_pdev_t u16 +#define blkif_sector_t u64 + typedef struct { blkif_pdev_t device; blkif_sector_t sector_start; @@ -104,7 +105,7 @@ typedef struct { /* IN */ domid_t domid; /* Domain attached to new interface. */ unsigned int blkif_handle; /* Domain-specific interface handle. */ - unsigned int evtchn_port; /* Event channel for notifications. */ + unsigned int evtchn; /* Event channel for notifications. */ unsigned long shmem_frame; /* Page cont. shared comms window. */ /* OUT */ unsigned int status; diff --git a/tools/xend/lib/manager.py b/tools/xend/lib/manager.py index 8e336763f1..42d66d3a95 100644 --- a/tools/xend/lib/manager.py +++ b/tools/xend/lib/manager.py @@ -22,7 +22,7 @@ def new_control_interface(dom, console_port=-1): if console_port < 0: console_port = 9600 + port.local_port - # Create a listenign console interface. + # Create a listening console interface. con_if = xend.console.interface(console_port, port.local_port) con_if.listen() |