Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 b63f8cc9 编写于 作者: D Daniel P. Berrange
浏览文件
操作

Split up struct qemud_server to move qemu stuff into conf.c

上级 498cc578
展开全部 显示空白变更内容
内联 并排
Showing with 927 addition and 892 deletion
ChangeLog
浏览文件 @ b63f8cc9
Tue Jun 26 18:10:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* qemud/conf.c, qemud/conf.h, qemud/dispatch.c, qemud/driver.c,
qemud/driver.h, qemud/internal.h, qemud/qemud.c: Split the
struct qemud_server into two parts, moving QEMU stuff out into
struct qemud_driver. Move all QEMU related data structures
and manipulation code into conf.c file
Tue Jun 26 16:50:00 EST 2007 Daniel P. Berrange <berrange@redhat.com> Tue Jun 26 16:50:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* qemud/Makefile.am, qemud/conf.c, qemud/dispatch.c, qemud/driver.c, * qemud/Makefile.am, qemud/conf.c, qemud/dispatch.c, qemud/driver.c,
......
qemud/conf.c
浏览文件 @ b63f8cc9
此差异已折叠。
qemud/conf.h
浏览文件 @ b63f8cc9
...@@ -24,15 +24,277 @@ ...@@ -24,15 +24,277 @@
#ifndef __QEMUD_CONF_H #ifndef __QEMUD_CONF_H
#define __QEMUD_CONF_H #define __QEMUD_CONF_H
#include "internal.h" /* Different types of QEMU acceleration possible */
enum qemud_vm_virt_type {
QEMUD_VIRT_QEMU,
QEMUD_VIRT_KQEMU,
QEMUD_VIRT_KVM,
};
/* Two types of disk backends */
enum qemud_vm_disk_type {
QEMUD_DISK_BLOCK,
QEMUD_DISK_FILE
};
/* Three types of disk frontend */
enum qemud_vm_disk_device {
QEMUD_DISK_DISK,
QEMUD_DISK_CDROM,
QEMUD_DISK_FLOPPY,
};
/* Stores the virtual disk configuration */
struct qemud_vm_disk_def {
int type;
int device;
char src[PATH_MAX];
char dst[NAME_MAX];
int readonly;
struct qemud_vm_disk_def *next;
};
#define QEMUD_MAC_ADDRESS_LEN 6
#define QEMUD_OS_TYPE_MAX_LEN 10
#define QEMUD_OS_ARCH_MAX_LEN 10
#define QEMUD_OS_MACHINE_MAX_LEN 10
/* 5 different types of networking config */
enum qemud_vm_net_type {
QEMUD_NET_USER,
QEMUD_NET_ETHERNET,
QEMUD_NET_SERVER,
QEMUD_NET_CLIENT,
QEMUD_NET_MCAST,
QEMUD_NET_NETWORK,
QEMUD_NET_BRIDGE,
};
/* Stores the virtual network interface configuration */
struct qemud_vm_net_def {
int type;
unsigned char mac[QEMUD_MAC_ADDRESS_LEN];
union {
struct {
char ifname[BR_IFNAME_MAXLEN];
char script[PATH_MAX];
} ethernet;
struct {
char address[BR_INET_ADDR_MAXLEN];
int port;
} socket; /* any of NET_CLIENT or NET_SERVER or NET_MCAST */
struct {
char name[QEMUD_MAX_NAME_LEN];
char ifname[BR_IFNAME_MAXLEN];
} network;
struct {
char brname[BR_IFNAME_MAXLEN];
char ifname[BR_IFNAME_MAXLEN];
} bridge;
} dst;
struct qemud_vm_net_def *next;
};
#define QEMUD_MAX_BOOT_DEVS 4
/* 3 possible boot devices */
enum qemud_vm_boot_order {
QEMUD_BOOT_FLOPPY,
QEMUD_BOOT_CDROM,
QEMUD_BOOT_DISK,
QEMUD_BOOT_NET,
};
/* 3 possible graphics console modes */
enum qemud_vm_grapics_type {
QEMUD_GRAPHICS_NONE,
QEMUD_GRAPHICS_SDL,
QEMUD_GRAPHICS_VNC,
};
/* Internal flags to keep track of qemu command line capabilities */
enum qemud_cmd_flags {
QEMUD_CMD_FLAG_KQEMU = 1,
QEMUD_CMD_FLAG_VNC_COLON = 2,
QEMUD_CMD_FLAG_NO_REBOOT = 4,
};
enum qemud_vm_features {
QEMUD_FEATURE_ACPI = 1,
};
/* Operating system configuration data & machine / arch */
struct qemud_vm_os_def {
char type[QEMUD_OS_TYPE_MAX_LEN];
char arch[QEMUD_OS_ARCH_MAX_LEN];
char machine[QEMUD_OS_MACHINE_MAX_LEN];
int nBootDevs;
int bootDevs[QEMUD_MAX_BOOT_DEVS];
char kernel[PATH_MAX];
char initrd[PATH_MAX];
char cmdline[PATH_MAX];
char binary[PATH_MAX];
};
/* Guest VM main configuration */
struct qemud_vm_def {
int virtType;
unsigned char uuid[QEMUD_UUID_RAW_LEN];
char name[QEMUD_MAX_NAME_LEN];
int memory;
int maxmem;
int vcpus;
int noReboot;
struct qemud_vm_os_def os;
int features;
int graphicsType;
int vncPort;
int vncActivePort;
int ndisks;
struct qemud_vm_disk_def *disks;
int nnets;
struct qemud_vm_net_def *nets;
};
/* Guest VM runtime state */
struct qemud_vm {
int stdout;
int stderr;
int monitor;
int logfile;
int pid;
int id;
int state;
int *tapfds;
int ntapfds;
char configFile[PATH_MAX];
char autostartLink[PATH_MAX];
struct qemud_vm_def *def; /* The current definition */
struct qemud_vm_def *newDef; /* New definition to activate at shutdown */
unsigned int autostart : 1;
struct qemud_vm *next;
};
/* Store start and end addresses of a dhcp range */
struct qemud_dhcp_range_def {
char start[BR_INET_ADDR_MAXLEN];
char end[BR_INET_ADDR_MAXLEN];
struct qemud_dhcp_range_def *next;
};
/* Virtual Network main configuration */
struct qemud_network_def {
unsigned char uuid[QEMUD_UUID_RAW_LEN];
char name[QEMUD_MAX_NAME_LEN];
char bridge[BR_IFNAME_MAXLEN];
int disableSTP;
int forwardDelay;
int forward;
char forwardDev[BR_IFNAME_MAXLEN];
char ipAddress[BR_INET_ADDR_MAXLEN];
char netmask[BR_INET_ADDR_MAXLEN];
char network[BR_INET_ADDR_MAXLEN+BR_INET_ADDR_MAXLEN+1];
int nranges;
struct qemud_dhcp_range_def *ranges;
};
/* Virtual Network runtime state */
struct qemud_network {
char configFile[PATH_MAX];
char autostartLink[PATH_MAX];
struct qemud_network_def *def; /* The current definition */
struct qemud_network_def *newDef; /* New definition to activate at shutdown */
char bridge[BR_IFNAME_MAXLEN];
int dnsmasqPid;
unsigned int active : 1;
unsigned int autostart : 1;
struct qemud_network *next;
};
/* Main driver state */
struct qemud_driver {
int qemuVersion;
int qemuCmdFlags; /* values from enum qemud_cmd_flags */
int nactivevms;
int ninactivevms;
struct qemud_vm *vms;
int nextvmid;
int nactivenetworks;
int ninactivenetworks;
struct qemud_network *networks;
brControl *brctl;
iptablesContext *iptables;
char *configDir;
char *autostartDir;
char *networkConfigDir;
char *networkAutostartDir;
char logDir[PATH_MAX];
};
static inline int
qemudIsActiveVM(struct qemud_vm *vm)
{
return vm->id != -1;
}
static inline int
qemudIsActiveNetwork(struct qemud_network *network)
{
return network->active;
}
void qemudReportError(virConnectPtr conn,
virDomainPtr dom,
virNetworkPtr net,
int code, const char *fmt, ...)
ATTRIBUTE_FORMAT(printf,5,6);
struct qemud_vm *qemudFindVMByID(const struct qemud_driver *driver,
int id);
struct qemud_vm *qemudFindVMByUUID(const struct qemud_driver *driver,
const unsigned char *uuid);
struct qemud_vm *qemudFindVMByName(const struct qemud_driver *driver,
const char *name);
struct qemud_network *qemudFindNetworkByUUID(const struct qemud_driver *driver,
const unsigned char *uuid);
struct qemud_network *qemudFindNetworkByName(const struct qemud_driver *driver,
const char *name);
int qemudExtractVersion (struct qemud_server *server); int qemudExtractVersion (struct qemud_driver *driver);
int qemudBuildCommandLine (struct qemud_server *server, int qemudBuildCommandLine (struct qemud_driver *driver,
struct qemud_vm *vm, struct qemud_vm *vm,
char ***argv); char ***argv);
int qemudScanConfigs (struct qemud_server *server); int qemudScanConfigs (struct qemud_driver *driver);
int qemudDeleteConfig (struct qemud_server *server, int qemudDeleteConfig (struct qemud_driver *driver,
const char *configFile, const char *configFile,
const char *name); const char *name);
int qemudEnsureDir (const char *path); int qemudEnsureDir (const char *path);
...@@ -41,19 +303,19 @@ void qemudFreeVMDef (struct qemud_vm_def *vm); ...@@ -41,19 +303,19 @@ void qemudFreeVMDef (struct qemud_vm_def *vm);
void qemudFreeVM (struct qemud_vm *vm); void qemudFreeVM (struct qemud_vm *vm);
struct qemud_vm * struct qemud_vm *
qemudAssignVMDef (struct qemud_server *server, qemudAssignVMDef (struct qemud_driver *driver,
struct qemud_vm_def *def); struct qemud_vm_def *def);
void qemudRemoveInactiveVM (struct qemud_server *server, void qemudRemoveInactiveVM (struct qemud_driver *driver,
struct qemud_vm *vm); struct qemud_vm *vm);
struct qemud_vm_def * struct qemud_vm_def *
qemudParseVMDef (struct qemud_server *server, qemudParseVMDef (struct qemud_driver *driver,
const char *xmlStr, const char *xmlStr,
const char *displayName); const char *displayName);
int qemudSaveVMDef (struct qemud_server *server, int qemudSaveVMDef (struct qemud_driver *driver,
struct qemud_vm *vm, struct qemud_vm *vm,
struct qemud_vm_def *def); struct qemud_vm_def *def);
char * qemudGenerateXML (struct qemud_server *server, char * qemudGenerateXML (struct qemud_driver *driver,
struct qemud_vm *vm, struct qemud_vm *vm,
struct qemud_vm_def *def, struct qemud_vm_def *def,
int live); int live);
...@@ -62,19 +324,19 @@ void qemudFreeNetworkDef (struct qemud_network_def *def); ...@@ -62,19 +324,19 @@ void qemudFreeNetworkDef (struct qemud_network_def *def);
void qemudFreeNetwork (struct qemud_network *network); void qemudFreeNetwork (struct qemud_network *network);
struct qemud_network * struct qemud_network *
qemudAssignNetworkDef (struct qemud_server *server, qemudAssignNetworkDef (struct qemud_driver *driver,
struct qemud_network_def *def); struct qemud_network_def *def);
void qemudRemoveInactiveNetwork (struct qemud_server *server, void qemudRemoveInactiveNetwork (struct qemud_driver *driver,
struct qemud_network *network); struct qemud_network *network);
struct qemud_network_def * struct qemud_network_def *
qemudParseNetworkDef (struct qemud_server *server, qemudParseNetworkDef (struct qemud_driver *driver,
const char *xmlStr, const char *xmlStr,
const char *displayName); const char *displayName);
int qemudSaveNetworkDef (struct qemud_server *server, int qemudSaveNetworkDef (struct qemud_driver *driver,
struct qemud_network *network, struct qemud_network *network,
struct qemud_network_def *def); struct qemud_network_def *def);
char * qemudGenerateNetworkXML (struct qemud_server *server, char * qemudGenerateNetworkXML (struct qemud_driver *driver,
struct qemud_network *network, struct qemud_network *network,
struct qemud_network_def *def); struct qemud_network_def *def);
......
qemud/dispatch.c
浏览文件 @ b63f8cc9
此差异已折叠。
qemud/driver.c
浏览文件 @ b63f8cc9
此差异已折叠。
qemud/driver.h
浏览文件 @ b63f8cc9
...@@ -26,28 +26,23 @@ ...@@ -26,28 +26,23 @@
#define QEMUD_DRIVER_H #define QEMUD_DRIVER_H
#include "internal.h" #include "internal.h"
#include "conf.h"
int qemudStartVMDaemon(struct qemud_server *server, int qemudStartVMDaemon(struct qemud_driver *driver,
struct qemud_vm *vm); struct qemud_vm *vm);
int qemudShutdownVMDaemon(struct qemud_server *server, int qemudShutdownVMDaemon(struct qemud_driver *driver,
struct qemud_vm *vm); struct qemud_vm *vm);
int qemudStartNetworkDaemon(struct qemud_server *server, int qemudStartNetworkDaemon(struct qemud_driver *driver,
struct qemud_network *network); struct qemud_network *network);
int qemudShutdownNetworkDaemon(struct qemud_server *server, int qemudShutdownNetworkDaemon(struct qemud_driver *driver,
struct qemud_network *network); struct qemud_network *network);
int qemudStartup(struct qemud_server *server); int qemudStartup(void);
void qemudReload(struct qemud_server *server); void qemudReload(void);
void qemudShutdown(struct qemud_server *server); void qemudShutdown(void);
void qemudReportError(virConnectPtr conn,
virDomainPtr dom,
virNetworkPtr net,
int code, const char *fmt, ...)
ATTRIBUTE_FORMAT(printf,5,6);
int qemudGetNodeInfo(unsigned int *memory, int qemudGetNodeInfo(unsigned int *memory,
char *cpuModel, int cpuModelLength, char *cpuModel, int cpuModelLength,
...@@ -55,100 +50,89 @@ int qemudGetNodeInfo(unsigned int *memory, ...@@ -55,100 +50,89 @@ int qemudGetNodeInfo(unsigned int *memory,
unsigned int *nodes, unsigned int *sockets, unsigned int *nodes, unsigned int *sockets,
unsigned int *cores, unsigned int *threads); unsigned int *cores, unsigned int *threads);
char *qemudGetCapabilities(struct qemud_server *server); char *qemudGetCapabilities(struct qemud_driver *driver);
int qemudMonitorCommand(struct qemud_server *server, int qemudMonitorCommand(struct qemud_driver *driver,
struct qemud_vm *vm, struct qemud_vm *vm,
const char *cmd, const char *cmd,
char **reply); char **reply);
struct qemud_vm *qemudFindVMByID(const struct qemud_server *server, int qemudGetVersion(struct qemud_driver *driver);
int id); int qemudListDomains(struct qemud_driver *driver,
struct qemud_vm *qemudFindVMByUUID(const struct qemud_server *server,
const unsigned char *uuid);
struct qemud_vm *qemudFindVMByName(const struct qemud_server *server,
const char *name);
int qemudGetVersion(struct qemud_server *server);
int qemudListDomains(struct qemud_server *server,
int *ids, int *ids,
int nids); int nids);
int qemudNumDomains(struct qemud_server *server); int qemudNumDomains(struct qemud_driver *driver);
struct qemud_vm *qemudDomainCreate(struct qemud_server *server, struct qemud_vm *qemudDomainCreate(struct qemud_driver *driver,
const char *xml); const char *xml);
int qemudDomainSuspend(struct qemud_server *server, int qemudDomainSuspend(struct qemud_driver *driver,
int id); int id);
int qemudDomainResume(struct qemud_server *server, int qemudDomainResume(struct qemud_driver *driver,
int id); int id);
int qemudDomainDestroy(struct qemud_server *server, int qemudDomainDestroy(struct qemud_driver *driver,
int id); int id);
int qemudDomainGetInfo(struct qemud_server *server, int qemudDomainGetInfo(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
int *runstate, int *runstate,
unsigned long long *cputime, unsigned long long *cputime,
unsigned long *maxmem, unsigned long *maxmem,
unsigned long *memory, unsigned long *memory,
unsigned int *nrVirtCpu); unsigned int *nrVirtCpu);
int qemudDomainSave(struct qemud_server *server, int qemudDomainSave(struct qemud_driver *driver,
int id, int id,
const char *path); const char *path);
int qemudDomainRestore(struct qemud_server *server, int qemudDomainRestore(struct qemud_driver *driver,
const char *path); const char *path);
int qemudDomainDumpXML(struct qemud_server *server, int qemudDomainDumpXML(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
char *xml, char *xml,
int xmllen); int xmllen);
int qemudListDefinedDomains(struct qemud_server *server, int qemudListDefinedDomains(struct qemud_driver *driver,
char *const*names, char *const*names,
int nnames); int nnames);
int qemudNumDefinedDomains(struct qemud_server *server); int qemudNumDefinedDomains(struct qemud_driver *driver);
struct qemud_vm *qemudDomainStart(struct qemud_server *server, struct qemud_vm *qemudDomainStart(struct qemud_driver *driver,
const unsigned char *uuid); const unsigned char *uuid);
struct qemud_vm *qemudDomainDefine(struct qemud_server *server, struct qemud_vm *qemudDomainDefine(struct qemud_driver *driver,
const char *xml); const char *xml);
int qemudDomainUndefine(struct qemud_server *server, int qemudDomainUndefine(struct qemud_driver *driver,
const unsigned char *uuid); const unsigned char *uuid);
int qemudDomainGetAutostart(struct qemud_server *server, int qemudDomainGetAutostart(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
int *autostart); int *autostart);
int qemudDomainSetAutostart(struct qemud_server *server, int qemudDomainSetAutostart(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
int autostart); int autostart);
struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server,
const unsigned char *uuid);
struct qemud_network *qemudFindNetworkByName(const struct qemud_server *server,
const char *name);
int qemudNumNetworks(struct qemud_server *server); int qemudNumNetworks(struct qemud_driver *driver);
int qemudListNetworks(struct qemud_server *server, int qemudListNetworks(struct qemud_driver *driver,
char *const*names, char *const*names,
int nnames); int nnames);
int qemudNumDefinedNetworks(struct qemud_server *server); int qemudNumDefinedNetworks(struct qemud_driver *driver);
int qemudListDefinedNetworks(struct qemud_server *server, int qemudListDefinedNetworks(struct qemud_driver *driver,
char *const*names, char *const*names,
int nnames); int nnames);
struct qemud_network *qemudNetworkCreate(struct qemud_server *server, struct qemud_network *qemudNetworkCreate(struct qemud_driver *driver,
const char *xml); const char *xml);
struct qemud_network *qemudNetworkDefine(struct qemud_server *server, struct qemud_network *qemudNetworkDefine(struct qemud_driver *driver,
const char *xml); const char *xml);
struct qemud_network *qemudNetworkStart(struct qemud_server *server, struct qemud_network *qemudNetworkStart(struct qemud_driver *driver,
const unsigned char *uuid); const unsigned char *uuid);
int qemudNetworkUndefine(struct qemud_server *server, int qemudNetworkUndefine(struct qemud_driver *driver,
const unsigned char *uuid); const unsigned char *uuid);
int qemudNetworkDestroy(struct qemud_server *server, int qemudNetworkDestroy(struct qemud_driver *driver,
const unsigned char *uuid); const unsigned char *uuid);
int qemudNetworkDumpXML(struct qemud_server *server, int qemudNetworkDumpXML(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
char *xml, char *xml,
int xmllen); int xmllen);
int qemudNetworkGetBridgeName(struct qemud_server *server, int qemudNetworkGetBridgeName(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
char *ifname, char *ifname,
int ifnamelen); int ifnamelen);
int qemudNetworkGetAutostart(struct qemud_server *server, int qemudNetworkGetAutostart(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
int *autostart); int *autostart);
int qemudNetworkSetAutostart(struct qemud_server *server, int qemudNetworkSetAutostart(struct qemud_driver *driver,
const unsigned char *uuid, const unsigned char *uuid,
int autostart); int autostart);
......
qemud/internal.h
浏览文件 @ b63f8cc9
...@@ -61,216 +61,6 @@ typedef enum { ...@@ -61,216 +61,6 @@ typedef enum {
#endif #endif
} qemudLogPriority; } qemudLogPriority;
/* Different types of QEMU acceleration possible */
enum qemud_vm_virt_type {
QEMUD_VIRT_QEMU,
QEMUD_VIRT_KQEMU,
QEMUD_VIRT_KVM,
};
/* Two types of disk backends */
enum qemud_vm_disk_type {
QEMUD_DISK_BLOCK,
QEMUD_DISK_FILE
};
/* Three types of disk frontend */
enum qemud_vm_disk_device {
QEMUD_DISK_DISK,
QEMUD_DISK_CDROM,
QEMUD_DISK_FLOPPY,
};
/* Stores the virtual disk configuration */
struct qemud_vm_disk_def {
int type;
int device;
char src[PATH_MAX];
char dst[NAME_MAX];
int readonly;
struct qemud_vm_disk_def *next;
};
#define QEMUD_MAC_ADDRESS_LEN 6
#define QEMUD_OS_TYPE_MAX_LEN 10
#define QEMUD_OS_ARCH_MAX_LEN 10
#define QEMUD_OS_MACHINE_MAX_LEN 10
/* 5 different types of networking config */
enum qemud_vm_net_type {
QEMUD_NET_USER,
QEMUD_NET_ETHERNET,
QEMUD_NET_SERVER,
QEMUD_NET_CLIENT,
QEMUD_NET_MCAST,
QEMUD_NET_NETWORK,
QEMUD_NET_BRIDGE,
};
/* Stores the virtual network interface configuration */
struct qemud_vm_net_def {
int type;
unsigned char mac[QEMUD_MAC_ADDRESS_LEN];
union {
struct {
char ifname[BR_IFNAME_MAXLEN];
char script[PATH_MAX];
} ethernet;
struct {
char address[BR_INET_ADDR_MAXLEN];
int port;
} socket; /* any of NET_CLIENT or NET_SERVER or NET_MCAST */
struct {
char name[QEMUD_MAX_NAME_LEN];
char ifname[BR_IFNAME_MAXLEN];
} network;
struct {
char brname[BR_IFNAME_MAXLEN];
char ifname[BR_IFNAME_MAXLEN];
} bridge;
} dst;
struct qemud_vm_net_def *next;
};
#define QEMUD_MAX_BOOT_DEVS 4
/* 3 possible boot devices */
enum qemud_vm_boot_order {
QEMUD_BOOT_FLOPPY,
QEMUD_BOOT_CDROM,
QEMUD_BOOT_DISK,
QEMUD_BOOT_NET,
};
/* 3 possible graphics console modes */
enum qemud_vm_grapics_type {
QEMUD_GRAPHICS_NONE,
QEMUD_GRAPHICS_SDL,
QEMUD_GRAPHICS_VNC,
};
/* Internal flags to keep track of qemu command line capabilities */
enum qemud_cmd_flags {
QEMUD_CMD_FLAG_KQEMU = 1,
QEMUD_CMD_FLAG_VNC_COLON = 2,
QEMUD_CMD_FLAG_NO_REBOOT = 4,
};
enum qemud_vm_features {
QEMUD_FEATURE_ACPI = 1,
};
/* Operating system configuration data & machine / arch */
struct qemud_vm_os_def {
char type[QEMUD_OS_TYPE_MAX_LEN];
char arch[QEMUD_OS_ARCH_MAX_LEN];
char machine[QEMUD_OS_MACHINE_MAX_LEN];
int nBootDevs;
int bootDevs[QEMUD_MAX_BOOT_DEVS];
char kernel[PATH_MAX];
char initrd[PATH_MAX];
char cmdline[PATH_MAX];
char binary[PATH_MAX];
};
/* Guest VM main configuration */
struct qemud_vm_def {
int virtType;
unsigned char uuid[QEMUD_UUID_RAW_LEN];
char name[QEMUD_MAX_NAME_LEN];
int memory;
int maxmem;
int vcpus;
int noReboot;
struct qemud_vm_os_def os;
int features;
int graphicsType;
int vncPort;
int vncActivePort;
int ndisks;
struct qemud_vm_disk_def *disks;
int nnets;
struct qemud_vm_net_def *nets;
};
/* Guest VM runtime state */
struct qemud_vm {
int stdout;
int stderr;
int monitor;
int logfile;
int pid;
int id;
int state;
int *tapfds;
int ntapfds;
char configFile[PATH_MAX];
char autostartLink[PATH_MAX];
struct qemud_vm_def *def; /* The current definition */
struct qemud_vm_def *newDef; /* New definition to activate at shutdown */
unsigned int autostart : 1;
struct qemud_vm *next;
};
/* Store start and end addresses of a dhcp range */
struct qemud_dhcp_range_def {
char start[BR_INET_ADDR_MAXLEN];
char end[BR_INET_ADDR_MAXLEN];
struct qemud_dhcp_range_def *next;
};
/* Virtual Network main configuration */
struct qemud_network_def {
unsigned char uuid[QEMUD_UUID_RAW_LEN];
char name[QEMUD_MAX_NAME_LEN];
char bridge[BR_IFNAME_MAXLEN];
int disableSTP;
int forwardDelay;
int forward;
char forwardDev[BR_IFNAME_MAXLEN];
char ipAddress[BR_INET_ADDR_MAXLEN];
char netmask[BR_INET_ADDR_MAXLEN];
char network[BR_INET_ADDR_MAXLEN+BR_INET_ADDR_MAXLEN+1];
int nranges;
struct qemud_dhcp_range_def *ranges;
};
/* Virtual Network runtime state */
struct qemud_network {
char configFile[PATH_MAX];
char autostartLink[PATH_MAX];
struct qemud_network_def *def; /* The current definition */
struct qemud_network_def *newDef; /* New definition to activate at shutdown */
char bridge[BR_IFNAME_MAXLEN];
int dnsmasqPid;
unsigned int active : 1;
unsigned int autostart : 1;
struct qemud_network *next;
};
enum qemud_mode { enum qemud_mode {
QEMUD_MODE_RX_HEADER, QEMUD_MODE_RX_HEADER,
...@@ -333,24 +123,9 @@ struct qemud_socket { ...@@ -333,24 +123,9 @@ struct qemud_socket {
struct qemud_server { struct qemud_server {
int nsockets; int nsockets;
struct qemud_socket *sockets; struct qemud_socket *sockets;
int qemuVersion;
int qemuCmdFlags; /* values from enum qemud_cmd_flags */
int nclients; int nclients;
struct qemud_client *clients; struct qemud_client *clients;
int sigread; int sigread;
int nactivevms;
int ninactivevms;
struct qemud_vm *vms;
int nextvmid;
int nactivenetworks;
int ninactivenetworks;
struct qemud_network *networks;
brControl *brctl;
iptablesContext *iptables;
char *configDir;
char *autostartDir;
char *networkConfigDir;
char *networkAutostartDir;
char logDir[PATH_MAX]; char logDir[PATH_MAX];
unsigned int shutdown : 1; unsigned int shutdown : 1;
}; };
...@@ -367,17 +142,6 @@ void qemudLog(int priority, const char *fmt, ...) ...@@ -367,17 +142,6 @@ void qemudLog(int priority, const char *fmt, ...)
void remoteDispatchClientRequest (struct qemud_server *server, void remoteDispatchClientRequest (struct qemud_server *server,
struct qemud_client *client); struct qemud_client *client);
static inline int
qemudIsActiveVM(struct qemud_vm *vm)
{
return vm->id != -1;
}
static inline int
qemudIsActiveNetwork(struct qemud_network *network)
{
return network->active;
}
#endif #endif
......
qemud/qemud.c
浏览文件 @ b63f8cc9
...@@ -207,7 +207,7 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED, ...@@ -207,7 +207,7 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED,
case SIGHUP: case SIGHUP:
qemudLog(QEMUD_INFO, "Reloading configuration on SIGHUP"); qemudLog(QEMUD_INFO, "Reloading configuration on SIGHUP");
if (!remote) { if (!remote) {
qemudReload(server); qemudReload();
} }
break; break;
...@@ -217,7 +217,7 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED, ...@@ -217,7 +217,7 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED,
qemudLog(QEMUD_WARN, "Shutting down on signal %d", sigc); qemudLog(QEMUD_WARN, "Shutting down on signal %d", sigc);
if (!remote) { if (!remote) {
qemudShutdown(server); qemudShutdown();
} }
server->shutdown = 1; server->shutdown = 1;
...@@ -620,11 +620,6 @@ static int qemudInitPaths(struct qemud_server *server, ...@@ -620,11 +620,6 @@ static int qemudInitPaths(struct qemud_server *server,
unlink(roSockname); unlink(roSockname);
server->configDir =
server->autostartDir =
server->networkConfigDir =
server->networkAutostartDir = NULL;
if (snprintf(server->logDir, PATH_MAX, "%s/log/libvirt/qemu", LOCAL_STATE_DIR) >= PATH_MAX) if (snprintf(server->logDir, PATH_MAX, "%s/log/libvirt/qemu", LOCAL_STATE_DIR) >= PATH_MAX)
goto snprintf_error; goto snprintf_error;
} else { } else {
...@@ -660,30 +655,15 @@ static int qemudInitPaths(struct qemud_server *server, ...@@ -660,30 +655,15 @@ static int qemudInitPaths(struct qemud_server *server,
if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen)
goto snprintf_error; goto snprintf_error;
if (snprintf(server->logDir, PATH_MAX, "%s/.libvirt/qemu/log", pw->pw_dir) >= PATH_MAX)
goto snprintf_error;
if (asprintf (&base, "%s/.libvirt/qemu", pw->pw_dir) == -1) { if (asprintf (&base, "%s/.libvirt/qemu", pw->pw_dir) == -1) {
qemudLog (QEMUD_ERR, "out of memory in asprintf"); qemudLog (QEMUD_ERR, "out of memory in asprintf");
return -1; return -1;
} }
} }
/* Configuration paths are either ~/.libvirt/qemu/... (session) or
* /etc/libvirt/qemu/... (system).
*/
if (asprintf (&server->configDir, "%s", base) == -1)
goto out_of_memory;
if (asprintf (&server->autostartDir, "%s/autostart", base) == -1)
goto out_of_memory;
if (asprintf (&server->networkConfigDir, "%s/networks", base) == -1)
goto out_of_memory;
if (asprintf (&server->networkAutostartDir, "%s/networks/autostart",
base) == -1)
goto out_of_memory;
if (snprintf(server->logDir, PATH_MAX, "%s/log", base) >= PATH_MAX)
goto snprintf_error;
} /* !remote */ } /* !remote */
if (base) free (base); if (base) free (base);
...@@ -711,7 +691,6 @@ static struct qemud_server *qemudInitialize(int sigread) { ...@@ -711,7 +691,6 @@ static struct qemud_server *qemudInitialize(int sigread) {
} }
/* We don't have a dom-0, so start from 1 */ /* We don't have a dom-0, so start from 1 */
server->nextvmid = 1;
server->sigread = sigread; server->sigread = sigread;
roSockname[0] = '\0'; roSockname[0] = '\0';
...@@ -726,7 +705,7 @@ static struct qemud_server *qemudInitialize(int sigread) { ...@@ -726,7 +705,7 @@ static struct qemud_server *qemudInitialize(int sigread) {
goto cleanup; goto cleanup;
if (!remote) /* qemud only */ { if (!remote) /* qemud only */ {
if (qemudStartup(server) < 0) { if (qemudStartup() < 0) {
goto cleanup; goto cleanup;
} }
} else /* remote only */ { } else /* remote only */ {
...@@ -745,6 +724,7 @@ static struct qemud_server *qemudInitialize(int sigread) { ...@@ -745,6 +724,7 @@ static struct qemud_server *qemudInitialize(int sigread) {
return server; return server;
cleanup: cleanup:
qemudShutdown();
if (server) { if (server) {
struct qemud_socket *sock = server->sockets; struct qemud_socket *sock = server->sockets;
while (sock) { while (sock) {
...@@ -752,11 +732,6 @@ static struct qemud_server *qemudInitialize(int sigread) { ...@@ -752,11 +732,6 @@ static struct qemud_server *qemudInitialize(int sigread) {
sock = sock->next; sock = sock->next;
} }
if (server->configDir) free (server->configDir);
if (server->autostartDir) free (server->autostartDir);
if (server->networkConfigDir) free (server->networkConfigDir);
if (server->networkAutostartDir) free (server->networkAutostartDir);
free(server); free(server);
} }
return NULL; return NULL;
...@@ -1525,15 +1500,8 @@ static void qemudCleanup(struct qemud_server *server) { ...@@ -1525,15 +1500,8 @@ static void qemudCleanup(struct qemud_server *server) {
sock = next; sock = next;
} }
if (server->brctl)
brShutdown(server->brctl);
if (server->iptables)
iptablesContextFree(server->iptables);
if (server->configDir) free (server->configDir); qemudShutdown();
if (server->autostartDir) free (server->autostartDir);
if (server->networkConfigDir) free (server->networkConfigDir);
if (server->networkAutostartDir) free (server->networkAutostartDir);
free(server); free(server);
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或