Diff for /qemu/net.h between versions 1.1.1.10 and 1.1.1.11

version 1.1.1.10, 2018/04/24 18:56:52 version 1.1.1.11, 2018/04/24 19:35:22
Line 6 Line 6
 #include "qdict.h"  #include "qdict.h"
 #include "qemu-option.h"  #include "qemu-option.h"
 #include "net/queue.h"  #include "net/queue.h"
   #include "vmstate.h"
   
 struct MACAddr {  struct MACAddr {
     uint8_t a[6];      uint8_t a[6];
Line 36  typedef enum { Line 37  typedef enum {
     NET_CLIENT_TYPE_SOCKET,      NET_CLIENT_TYPE_SOCKET,
     NET_CLIENT_TYPE_VDE,      NET_CLIENT_TYPE_VDE,
     NET_CLIENT_TYPE_DUMP,      NET_CLIENT_TYPE_DUMP,
       NET_CLIENT_TYPE_BRIDGE,
   
     NET_CLIENT_TYPE_MAX      NET_CLIENT_TYPE_MAX
 } net_client_type;  } net_client_type;
Line 122  int qemu_find_nic_model(NICInfo *nd, con Line 124  int qemu_find_nic_model(NICInfo *nd, con
                         const char *default_model);                          const char *default_model);
   
 void do_info_network(Monitor *mon);  void do_info_network(Monitor *mon);
 int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data);  
   
 /* NIC info */  /* NIC info */
   
Line 174  int do_netdev_del(Monitor *mon, const QD Line 175  int do_netdev_del(Monitor *mon, const QD
   
 #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"
   #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
   #define DEFAULT_BRIDGE_INTERFACE "br0"
   
 void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);  void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
   
 int net_handle_fd_param(Monitor *mon, const char *param);  int net_handle_fd_param(Monitor *mon, const char *param);
   
   #define POLYNOMIAL 0x04c11db6
   unsigned compute_mcast_idx(const uint8_t *ep);
   
   #define vmstate_offset_macaddr(_state, _field)                       \
       vmstate_offset_array(_state, _field.a, uint8_t,                \
                            sizeof(typeof_field(_state, _field)))
   
   #define VMSTATE_MACADDR(_field, _state) {                            \
       .name       = (stringify(_field)),                               \
       .size       = sizeof(MACAddr),                                   \
       .info       = &vmstate_info_buffer,                              \
       .flags      = VMS_BUFFER,                                        \
       .offset     = vmstate_offset_macaddr(_state, _field),            \
   }
   
 #endif  #endif

Removed from v.1.1.1.10  
changed lines
  Added in v.1.1.1.11


unix.superglobalmegacorp.com