External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 07:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factor qemuBuildNicStr() out from qemuBuildCommandLine()

Browse Source 
Re-factor this code so that it can be used for NIC hotplug
too. The awkward arguments are needed to allow use to do
"pci_add auto nic macaddr=..."

* src/qemu_conf.c: factor the nic string formatting code into
  its own function
This commit is contained in:
Mark McLoughlin 2009-07-17 22:08:33 +01:00
parent 0165410712
commit ce2e300a4f
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/qemu_conf.c
View File

@ -833,6 +833,30 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
return NULL; return NULL;
} }
static int
qemuBuildNicStr(virConnectPtr conn,
virDomainNetDefPtr net,
const char *prefix,
char type_sep,
int vlan,
char **str)
{
if (virAsprintf(str,
"%snic%cmacaddr=%02x:%02x:%02x:%02x:%02x:%02x,vlan=%d%s%s",
prefix ? prefix : "",
type_sep,
net->mac[0], net->mac[1],
net->mac[2], net->mac[3],
net->mac[4], net->mac[5],
vlan,
(net->model ? ",model=" : ""),
(net->model ? net->model : "")) < 0) {
virReportOOMError(conn);
return -1;
}
return 0;
}
static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev,
char *buf, char *buf,
@ -1366,21 +1390,14 @@ int qemudBuildCommandLine(virConnectPtr conn,
} else { } else {
int vlan = 0; int vlan = 0;
for (i = 0 ; i < def->nnets ; i++) { for (i = 0 ; i < def->nnets ; i++) {
char nic[100];
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
char *nic;
if (snprintf(nic, sizeof(nic), if (qemuBuildNicStr(conn, net, NULL, ',', vlan, &nic) < 0)
"nic,macaddr=%02x:%02x:%02x:%02x:%02x:%02x,vlan=%d%s%s",
net->mac[0], net->mac[1],
net->mac[2], net->mac[3],
net->mac[4], net->mac[5],
vlan,
(net->model ? ",model=" : ""),
(net->model ? net->model : "")) >= sizeof(nic))
goto error; goto error;
ADD_ARG_LIT("-net"); ADD_ARG_LIT("-net");
ADD_ARG_LIT(nic); ADD_ARG(nic);
ADD_ARG_LIT("-net"); ADD_ARG_LIT("-net");
switch (net->type) { switch (net->type) {