projects
/
sdk
/
emulator
/
qemu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync with tizen_2.2
[sdk/emulator/qemu.git]
/
hw
/
xen_nic.c
diff --git
a/hw/xen_nic.c
b/hw/xen_nic.c
index
ef2a2d6
..
8b79bfb
100644
(file)
--- a/
hw/xen_nic.c
+++ b/
hw/xen_nic.c
@@
-14,6
+14,9
@@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-32,11
+35,6
@@
#include <sys/mman.h>
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/wait.h>
-#include <xs.h>
-#include <xenctrl.h>
-#include <xen/io/xenbus.h>
-#include <xen/io/netif.h>
-
#include "hw.h"
#include "net.h"
#include "net/checksum.h"
#include "hw.h"
#include "net.h"
#include "net/checksum.h"
@@
-44,6
+42,8
@@
#include "qemu-char.h"
#include "xen_backend.h"
#include "qemu-char.h"
#include "xen_backend.h"
+#include <xen/io/netif.h>
+
/* ------------------------------------------------------------- */
struct XenNetDev {
/* ------------------------------------------------------------- */
struct XenNetDev {
@@
-233,7
+233,7
@@
static void net_rx_response(struct XenNetDev *netdev,
#define NET_IP_ALIGN 2
#define NET_IP_ALIGN 2
-static int net_rx_ok(
VLAN
ClientState *nc)
+static int net_rx_ok(
Net
ClientState *nc)
{
struct XenNetDev *netdev = DO_UPCAST(NICState, nc, nc)->opaque;
RING_IDX rc, rp;
{
struct XenNetDev *netdev = DO_UPCAST(NICState, nc, nc)->opaque;
RING_IDX rc, rp;
@@
-254,7
+254,7
@@
static int net_rx_ok(VLANClientState *nc)
return 1;
}
return 1;
}
-static ssize_t net_rx_packet(
VLAN
ClientState *nc, const uint8_t *buf, size_t size)
+static ssize_t net_rx_packet(
Net
ClientState *nc, const uint8_t *buf, size_t size)
{
struct XenNetDev *netdev = DO_UPCAST(NICState, nc, nc)->opaque;
netif_rx_request_t rxreq;
{
struct XenNetDev *netdev = DO_UPCAST(NICState, nc, nc)->opaque;
netif_rx_request_t rxreq;
@@
-301,7
+301,7
@@
static ssize_t net_rx_packet(VLANClientState *nc, const uint8_t *buf, size_t siz
/* ------------------------------------------------------------- */
static NetClientInfo net_xen_info = {
/* ------------------------------------------------------------- */
static NetClientInfo net_xen_info = {
- .type = NET_CLIENT_
TYPE
_NIC,
+ .type = NET_CLIENT_
OPTIONS_KIND
_NIC,
.size = sizeof(NICState),
.can_receive = net_rx_ok,
.receive = net_rx_packet,
.size = sizeof(NICState),
.can_receive = net_rx_ok,
.receive = net_rx_packet,
@@
-325,7
+325,6
@@
static int net_init(struct XenDevice *xendev)
return -1;
}
return -1;
}
- netdev->conf.vlan = qemu_find_vlan(netdev->xendev.dev, 1);
netdev->conf.peer = NULL;
netdev->nic = qemu_new_nic(&net_xen_info, &netdev->conf,
netdev->conf.peer = NULL;
netdev->nic = qemu_new_nic(&net_xen_info, &netdev->conf,
@@
-407,7
+406,7
@@
static void net_disconnect(struct XenDevice *xendev)
netdev->rxs = NULL;
}
if (netdev->nic) {
netdev->rxs = NULL;
}
if (netdev->nic) {
- qemu_del_
vlan
_client(&netdev->nic->nc);
+ qemu_del_
net
_client(&netdev->nic->nc);
netdev->nic = NULL;
}
}
netdev->nic = NULL;
}
}