376253ece4
Refactor the monitor API and prepare it for decoupled terminals: term_print functions are renamed to monitor_* and all monitor services gain a new parameter (mon) that will once refer to the monitor instance the output is supposed to appear on. However, the argument remains unused for now. All monitor command callbacks are also extended by a mon parameter so that command handlers are able to pass an appropriate reference to monitor output services. For the case that monitor outputs so far happen without clearly identifiable context, the global variable cur_mon is introduced that shall once provide a pointer either to the current active monitor (while processing commands) or to the default one. On the mid or long term, those use case will be obsoleted so that this variable can be removed again. Due to the broad usage of the monitor interface, this patch mostly deals with converting users of the monitor API. A few of them are already extended to pass 'mon' from the command handler further down to internal functions that invoke monitor_printf. At this chance, monitor-related prototypes are moved from console.h to a new monitor.h. The same is done for the readline API. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6711 c046a42c-6fe2-441c-8c8c-71466251a162
117 lines
3.7 KiB
C
117 lines
3.7 KiB
C
#ifndef QEMU_NET_H
|
|
#define QEMU_NET_H
|
|
|
|
#include "qemu-common.h"
|
|
|
|
/* VLANs support */
|
|
|
|
typedef ssize_t (IOReadvHandler)(void *, const struct iovec *, int);
|
|
|
|
typedef struct VLANClientState 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;
|
|
LinkStatusChanged *link_status_changed;
|
|
int link_down;
|
|
void *opaque;
|
|
struct VLANClientState *next;
|
|
struct VLANState *vlan;
|
|
char *model;
|
|
char *name;
|
|
char info_str[256];
|
|
};
|
|
|
|
struct VLANState {
|
|
int id;
|
|
VLANClientState *first_client;
|
|
struct VLANState *next;
|
|
unsigned int nb_guest_devs, nb_host_devs;
|
|
};
|
|
|
|
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);
|
|
void qemu_del_vlan_client(VLANClientState *vc);
|
|
VLANClientState *qemu_find_vlan_client(VLANState *vlan, void *opaque);
|
|
int qemu_can_send_packet(VLANClientState *vc);
|
|
ssize_t qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov,
|
|
int iovcnt);
|
|
void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size);
|
|
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_list(NICInfo *nd, const char * const *models,
|
|
const char *default_model);
|
|
void qemu_handler_true(void *opaque);
|
|
|
|
void do_info_network(Monitor *mon);
|
|
int do_set_link(Monitor *mon, const char *name, const char *up_or_down);
|
|
|
|
/* NIC info */
|
|
|
|
#define MAX_NICS 8
|
|
|
|
struct NICInfo {
|
|
uint8_t macaddr[6];
|
|
const char *model;
|
|
const char *name;
|
|
VLANState *vlan;
|
|
void *private;
|
|
int used;
|
|
};
|
|
|
|
extern int nb_nics;
|
|
extern NICInfo nd_table[MAX_NICS];
|
|
|
|
/* BT HCI info */
|
|
|
|
struct HCIInfo {
|
|
int (*bdaddr_set)(struct HCIInfo *hci, const uint8_t *bd_addr);
|
|
void (*cmd_send)(struct HCIInfo *hci, const uint8_t *data, int len);
|
|
void (*sco_send)(struct HCIInfo *hci, const uint8_t *data, int len);
|
|
void (*acl_send)(struct HCIInfo *hci, const uint8_t *data, int len);
|
|
void *opaque;
|
|
void (*evt_recv)(void *opaque, const uint8_t *data, int len);
|
|
void (*acl_recv)(void *opaque, const uint8_t *data, int len);
|
|
};
|
|
|
|
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);
|
|
void net_cleanup(void);
|
|
int slirp_is_inited(void);
|
|
void net_client_check(void);
|
|
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_DOWN_SCRIPT "/etc/qemu-ifdown"
|
|
#ifdef __sun__
|
|
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
|
|
#else
|
|
#define SMBD_COMMAND "/usr/sbin/smbd"
|
|
#endif
|
|
|
|
#endif
|