mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
merge
This commit is contained in:
iap10@freefall.cl.cam.ac.uk committed
commit
2fabf79299
9 files changed
+206
-50
No files matched your search
@@ -655,7 +655,9 @@ static PyObject *xu_message_get_payload(PyObject *self, PyObject *args)
|
||||
case TYPE(CMSG_NETIF_FE, CMSG_NETIF_FE_INTERFACE_CONNECT):
|
||||
C2P(netif_fe_interface_connect_t, handle, Int, Long);
|
||||
C2P(netif_fe_interface_connect_t, tx_shmem_frame, Int, Long);
|
||||
C2P(netif_fe_interface_connect_t, tx_shmem_ref, Int, Long);
|
||||
C2P(netif_fe_interface_connect_t, rx_shmem_frame, Int, Long);
|
||||
C2P(netif_fe_interface_connect_t, rx_shmem_ref, Int, Long);
|
||||
return dict;
|
||||
case TYPE(CMSG_NETIF_FE, CMSG_NETIF_FE_INTERFACE_DISCONNECT):
|
||||
C2P(netif_fe_interface_disconnect_t, handle, Int, Long);
|
||||
@@ -681,7 +683,9 @@ static PyObject *xu_message_get_payload(PyObject *self, PyObject *args)
|
||||
C2P(netif_be_connect_t, domid, Int, Long);
|
||||
C2P(netif_be_connect_t, netif_handle, Int, Long);
|
||||
C2P(netif_be_connect_t, tx_shmem_frame, Int, Long);
|
||||
C2P(netif_be_connect_t, tx_shmem_ref, Int, Long);
|
||||
C2P(netif_be_connect_t, rx_shmem_frame, Int, Long);
|
||||
C2P(netif_be_connect_t, rx_shmem_ref, Int, Long);
|
||||
C2P(netif_be_connect_t, evtchn, Int, Long);
|
||||
C2P(netif_be_connect_t, status, Int, Long);
|
||||
return dict;
|
||||
@@ -903,8 +907,10 @@ static PyObject *xu_message_new(PyObject *self, PyObject *args)
|
||||
P2C(netif_be_connect_t, domid, u32);
|
||||
P2C(netif_be_connect_t, netif_handle, u32);
|
||||
P2C(netif_be_connect_t, tx_shmem_frame, memory_t);
|
||||
P2C(netif_be_connect_t, tx_shmem_ref, u32);
|
||||
P2C(netif_be_connect_t, rx_shmem_frame, memory_t);
|
||||
P2C(netif_be_connect_t, evtchn, u16);
|
||||
P2C(netif_be_connect_t, rx_shmem_ref, u32);
|
||||
P2C(netif_be_connect_t, evtchn, u16);
|
||||
break;
|
||||
case TYPE(CMSG_NETIF_BE, CMSG_NETIF_BE_DISCONNECT):
|
||||
P2C(netif_be_disconnect_t, domid, u32);
|
||||
|
||||
@@ -593,7 +593,7 @@ class XendDomainInfo:
|
||||
def delete(self):
|
||||
"""Delete the vm's db.
|
||||
"""
|
||||
if self.dom_get(self.id):
|
||||
if dom_get(self.id):
|
||||
return
|
||||
self.id = None
|
||||
self.saveToDB(sync=True)
|
||||
|
||||
@@ -421,7 +421,9 @@ class NetDev(Dev):
|
||||
'netif_handle' : self.vif,
|
||||
'evtchn' : self.getEventChannelBackend(),
|
||||
'tx_shmem_frame' : val['tx_shmem_frame'],
|
||||
'rx_shmem_frame' : val['rx_shmem_frame'] })
|
||||
'tx_shmem_ref' : val['tx_shmem_ref'],
|
||||
'rx_shmem_frame' : val['rx_shmem_frame'],
|
||||
'rx_shmem_ref' : val['rx_shmem_ref'] })
|
||||
msg = self.backendChannel.requestResponse(msg)
|
||||
#todo: check return status
|
||||
self.status = NETIF_INTERFACE_STATUS_CONNECTED
|
||||
|
||||