Diff for /qemu/net.h between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2018/04/24 17:07:13 version 1.1.1.4, 2018/04/24 17:21:28
Line 1 Line 1
 #ifndef QEMU_NET_H  #ifndef QEMU_NET_H
 #define QEMU_NET_H  #define QEMU_NET_H
   
   #include "sys-queue.h"
 #include "qemu-common.h"  #include "qemu-common.h"
   
 /* VLANs support */  /* VLANs support */
   
 typedef ssize_t (IOReadvHandler)(void *, const struct iovec *, int);  
   
 typedef struct VLANClientState VLANClientState;  typedef struct VLANClientState VLANClientState;
   
   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 (NetCleanup) (VLANClientState *);
 typedef void (LinkStatusChanged)(VLANClientState *);  typedef void (LinkStatusChanged)(VLANClientState *);
   
 struct VLANClientState {  struct VLANClientState {
     IOReadHandler *fd_read;      NetReceive *receive;
     IOReadvHandler *fd_readv;      NetReceiveIOV *receive_iov;
     /* Packets may still be sent if this returns zero.  It's used to      /* Packets may still be sent if this returns zero.  It's used to
        rate-limit the slirp code.  */         rate-limit the slirp code.  */
     IOCanRWHandler *fd_can_read;      NetCanReceive *can_receive;
     NetCleanup *cleanup;      NetCleanup *cleanup;
     LinkStatusChanged *link_status_changed;      LinkStatusChanged *link_status_changed;
     int link_down;      int link_down;
Line 29  struct VLANClientState { Line 31  struct VLANClientState {
     char info_str[256];      char info_str[256];
 };  };
   
   typedef struct VLANPacket VLANPacket;
   
   typedef void (NetPacketSent) (VLANClientState *, ssize_t);
   
   struct VLANPacket {
       TAILQ_ENTRY(VLANPacket) entry;
       VLANClientState *sender;
       int size;
       NetPacketSent *sent_cb;
       uint8_t data[0];
   };
   
 struct VLANState {  struct VLANState {
     int id;      int id;
     VLANClientState *first_client;      VLANClientState *first_client;
     struct VLANState *next;      struct VLANState *next;
     unsigned int nb_guest_devs, nb_host_devs;      unsigned int nb_guest_devs, nb_host_devs;
       TAILQ_HEAD(send_queue, VLANPacket) send_queue;
       int delivering;
 };  };
   
 VLANState *qemu_find_vlan(int id);  VLANState *qemu_find_vlan(int id, int allocate);
 VLANClientState *qemu_new_vlan_client(VLANState *vlan,  VLANClientState *qemu_new_vlan_client(VLANState *vlan,
                                       const char *model,                                        const char *model,
                                       const char *name,                                        const char *name,
                                       IOReadHandler *fd_read,                                        NetCanReceive *can_receive,
                                       IOCanRWHandler *fd_can_read,                                        NetReceive *receive,
                                         NetReceiveIOV *receive_iov,
                                       NetCleanup *cleanup,                                        NetCleanup *cleanup,
                                       void *opaque);                                        void *opaque);
 void qemu_del_vlan_client(VLANClientState *vc);  void qemu_del_vlan_client(VLANClientState *vc);
Line 49  VLANClientState *qemu_find_vlan_client(V Line 66  VLANClientState *qemu_find_vlan_client(V
 int qemu_can_send_packet(VLANClientState *vc);  int qemu_can_send_packet(VLANClientState *vc);
 ssize_t qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov,  ssize_t qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov,
                           int iovcnt);                            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);  void qemu_send_packet(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_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]);
 void qemu_check_nic_model(NICInfo *nd, const char *model);  void qemu_check_nic_model(NICInfo *nd, const char *model);
 void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,  void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
                                const char *default_model);                                 const char *default_model);
 void qemu_handler_true(void *opaque);  void qemu_handler_true(void *opaque);
   
 void do_info_network(void);  void do_info_network(Monitor *mon);
 int do_set_link(const char *name, const char *up_or_down);  void do_set_link(Monitor *mon, const char *name, const char *up_or_down);
   
   void do_info_usernet(Monitor *mon);
   
 /* NIC info */  /* NIC info */
   
 #define MAX_NICS 8  #define MAX_NICS 8
   enum {
           NIC_NVECTORS_UNSPECIFIED = -1
   };
   
 struct NICInfo {  struct NICInfo {
     uint8_t macaddr[6];      uint8_t macaddr[6];
     const char *model;      const char *model;
     const char *name;      const char *name;
       const char *devaddr;
       const char *id;
     VLANState *vlan;      VLANState *vlan;
       VLANClientState *vc;
     void *private;      void *private;
     int used;      int used;
       int bootable;
       int nvectors;
 };  };
   
 extern int nb_nics;  extern int nb_nics;
Line 97  uint16_t net_checksum_tcpudp(uint16_t le Line 130  uint16_t net_checksum_tcpudp(uint16_t le
 void net_checksum_calculate(uint8_t *data, int length);  void net_checksum_calculate(uint8_t *data, int length);
   
 /* from net.c */  /* from net.c */
 int net_client_init(const char *device, const char *p);  extern const char *legacy_tftp_prefix;
   extern const char *legacy_bootp_filename;
   
   int net_client_init(Monitor *mon, const char *device, const char *p);
 void net_client_uninit(NICInfo *nd);  void net_client_uninit(NICInfo *nd);
 int net_client_parse(const char *str);  int net_client_parse(const char *str);
 void net_slirp_smb(const char *exported_dir);  void net_slirp_smb(const char *exported_dir);
   void net_slirp_hostfwd_add(Monitor *mon, const char *arg1,
                              const char *arg2, const char *arg3);
   void net_slirp_hostfwd_remove(Monitor *mon, const char *arg1,
                                 const char *arg2, const char *arg3);
 void net_slirp_redir(const char *redir_str);  void net_slirp_redir(const char *redir_str);
 void net_cleanup(void);  void net_cleanup(void);
 int slirp_is_inited(void);  
 void net_client_check(void);  void net_client_check(void);
 void net_host_device_add(const char *device, const char *opts);  void net_set_boot_mask(int boot_mask);
 void net_host_device_remove(int vlan_id, const char *device);  void net_host_device_add(Monitor *mon, const char *device, const char *opts);
   void net_host_device_remove(Monitor *mon, int vlan_id, const char *device);
   
 #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"  #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"  #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
Line 116  void net_host_device_remove(int vlan_id, Line 156  void net_host_device_remove(int vlan_id,
 #define SMBD_COMMAND "/usr/sbin/smbd"  #define SMBD_COMMAND "/usr/sbin/smbd"
 #endif  #endif
   
   void qdev_get_macaddr(DeviceState *dev, uint8_t *macaddr);
   VLANClientState *qdev_get_vlan_client(DeviceState *dev,
                                         NetCanReceive *can_receive,
                                         NetReceive *receive,
                                         NetReceiveIOV *receive_iov,
                                         NetCleanup *cleanup,
                                         void *opaque);
   
 #endif  #endif

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


unix.superglobalmegacorp.com