X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=net.h;h=fe5ece7c0ed1d063d6ece539dcfb686315fcbc52;hb=6f7b3b1be229e3a686a4507d6c11dfcf5f12cef4;hp=a982394ee708ec155b2ce437db01239e4c5a6aca;hpb=8b13c4a794e26e4fd61a71858a24d309998825e0;p=qemu.git diff --git a/net.h b/net.h index a982394ee..4fdd9420b 100644 --- a/net.h +++ b/net.h @@ -1,60 +1,128 @@ #ifndef QEMU_NET_H #define QEMU_NET_H +#include "qemu-queue.h" #include "qemu-common.h" +#include "qdict.h" +#include "qemu-option.h" +#include "net/queue.h" -/* VLANs support */ +struct MACAddr { + uint8_t a[6]; +}; -typedef ssize_t (IOReadvHandler)(void *, const struct iovec *, int); +/* qdev nic properties */ -typedef struct VLANClientState VLANClientState; +typedef struct NICConf { + MACAddr macaddr; + VLANState *vlan; + VLANClientState *peer; + int32_t bootindex; +} NICConf; +#define DEFINE_NIC_PROPERTIES(_state, _conf) \ + DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \ + DEFINE_PROP_VLAN("vlan", _state, _conf.vlan), \ + DEFINE_PROP_NETDEV("netdev", _state, _conf.peer), \ + DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1) + +/* VLANs support */ + +typedef enum { + NET_CLIENT_TYPE_NONE, + NET_CLIENT_TYPE_NIC, + NET_CLIENT_TYPE_USER, + NET_CLIENT_TYPE_TAP, + NET_CLIENT_TYPE_SOCKET, + NET_CLIENT_TYPE_VDE, + NET_CLIENT_TYPE_DUMP, + + NET_CLIENT_TYPE_MAX +} net_client_type; + +typedef void (NetPoll)(VLANClientState *, bool enable); +typedef int (NetCanReceive)(VLANClientState *); +typedef ssize_t (NetReceive)(VLANClientState *, const uint8_t *, size_t); +typedef ssize_t (NetReceiveIOV)(VLANClientState *, const struct iovec *, int); +typedef void (NetCleanup) (VLANClientState *); typedef void (LinkStatusChanged)(VLANClientState *); -struct VLANClientState { - IOReadHandler *fd_read; - IOReadvHandler *fd_readv; - /* Packets may still be sent if this returns zero. It's used to - rate-limit the slirp code. */ - IOCanRWHandler *fd_can_read; +typedef struct NetClientInfo { + net_client_type type; + size_t size; + NetReceive *receive; + NetReceive *receive_raw; + NetReceiveIOV *receive_iov; + NetCanReceive *can_receive; + NetCleanup *cleanup; LinkStatusChanged *link_status_changed; + NetPoll *poll; +} NetClientInfo; + +struct VLANClientState { + NetClientInfo *info; int link_down; - void *opaque; - struct VLANClientState *next; + QTAILQ_ENTRY(VLANClientState) next; struct VLANState *vlan; + VLANClientState *peer; + NetQueue *send_queue; char *model; char *name; char info_str[256]; + unsigned receive_disabled : 1; }; +typedef struct NICState { + VLANClientState nc; + NICConf *conf; + void *opaque; + bool peer_deleted; +} NICState; + struct VLANState { int id; - VLANClientState *first_client; - struct VLANState *next; - unsigned int nb_guest_devs, nb_host_devs; + QTAILQ_HEAD(, VLANClientState) clients; + QTAILQ_ENTRY(VLANState) next; + NetQueue *send_queue; }; -VLANState *qemu_find_vlan(int id); -VLANClientState *qemu_new_vlan_client(VLANState *vlan, - const char *model, - const char *name, - IOReadHandler *fd_read, - IOCanRWHandler *fd_can_read, - void *opaque); +VLANState *qemu_find_vlan(int id, int allocate); +VLANClientState *qemu_find_netdev(const char *id); +VLANClientState *qemu_new_net_client(NetClientInfo *info, + VLANState *vlan, + VLANClientState *peer, + const char *model, + const char *name); +NICState *qemu_new_nic(NetClientInfo *info, + NICConf *conf, + const char *model, + const char *name, + void *opaque); void qemu_del_vlan_client(VLANClientState *vc); -VLANClientState *qemu_find_vlan_client(VLANState *vlan, void *opaque); +VLANClientState *qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id, + const char *client_str); +typedef void (*qemu_nic_foreach)(NICState *nic, void *opaque); +void qemu_foreach_nic(qemu_nic_foreach func, void *opaque); int qemu_can_send_packet(VLANClientState *vc); ssize_t qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov, int iovcnt); +ssize_t qemu_sendv_packet_async(VLANClientState *vc, const struct iovec *iov, + int iovcnt, NetPacketSent *sent_cb); void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size); +ssize_t qemu_send_packet_raw(VLANClientState *vc, const uint8_t *buf, int size); +ssize_t qemu_send_packet_async(VLANClientState *vc, const uint8_t *buf, + int size, NetPacketSent *sent_cb); +void qemu_purge_queued_packets(VLANClientState *vc); +void qemu_flush_queued_packets(VLANClientState *vc); void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]); +void qemu_macaddr_default_if_unset(MACAddr *macaddr); +int qemu_show_nic_models(const char *arg, const char *const *models); void qemu_check_nic_model(NICInfo *nd, const char *model); -void qemu_check_nic_model_list(NICInfo *nd, const char * const *models, - const char *default_model); -void qemu_handler_true(void *opaque); +int qemu_find_nic_model(NICInfo *nd, const char * const *models, + const char *default_model); -void do_info_network(void); -int do_set_link(const char *name, const char *up_or_down); +void do_info_network(Monitor *mon); +int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data); /* NIC info */ @@ -62,15 +130,19 @@ int do_set_link(const char *name, const char *up_or_down); struct NICInfo { uint8_t macaddr[6]; - const char *model; - const char *name; + char *model; + char *name; + char *devaddr; VLANState *vlan; - void *private; - int used; + VLANClientState *netdev; + int used; /* is this slot in nd_table[] being used? */ + int instantiated; /* does this NICInfo correspond to an instantiated NIC? */ + int nvectors; }; extern int nb_nics; extern NICInfo nd_table[MAX_NICS]; +extern int default_net; /* BT HCI info */ @@ -86,22 +158,19 @@ struct HCIInfo { struct HCIInfo *qemu_next_hci(void); -/* checksumming functions (net-checksum.c) */ -uint32_t net_checksum_add(int len, uint8_t *buf); -uint16_t net_checksum_finish(uint32_t sum); -uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto, - uint8_t *addrs, uint8_t *buf); -void net_checksum_calculate(uint8_t *data, int length); - /* from net.c */ -int net_client_init(const char *device, const char *p); -void net_client_uninit(NICInfo *nd); -int net_client_parse(const char *str); -void net_slirp_smb(const char *exported_dir); -void net_slirp_redir(const char *redir_str); +extern const char *legacy_tftp_prefix; +extern const char *legacy_bootp_filename; + +int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev); +int net_client_parse(QemuOptsList *opts_list, const char *str); +int net_init_clients(void); +void net_check_clients(void); void net_cleanup(void); -int slirp_is_inited(void); -void net_client_check(void); +void net_host_device_add(Monitor *mon, const QDict *qdict); +void net_host_device_remove(Monitor *mon, const QDict *qdict); +int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data); +int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data); #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" @@ -111,4 +180,8 @@ void net_client_check(void); #define SMBD_COMMAND "/usr/sbin/smbd" #endif +void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); + +int net_handle_fd_param(Monitor *mon, const char *param); + #endif