External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: eliminate use of virDomainNetDefClear() in qemuConnectDomainXMLToNative()

Browse Source 
Instead of saving the interesting pieces of each existing NetDef,
clearing it, and then copying back the saved pieces after setting the
type to ethernet, just create a new NetDef, copy in the interesting
bits, and replace the old one. (The end game is to eliminate
virDomainNetDefClear() completely, since this is the only real use)

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2020-09-22 21:19:38 -04:00
parent fdaa14c3a3
commit 5bbf2fa7af
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qemu/qemu_driver.c
View File

@ -6456,24 +6456,20 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
*/
for (i = 0; i < vm->def->nnets; i++) {
virDomainNetDefPtr net = vm->def->nets[i];
unsigned int bootIndex = net->info.bootIndex;
g_autofree char *model = NULL;
virMacAddr mac = net->mac;
char *script = net->script;
virDomainNetDefPtr newNet = virDomainNetDefNew(driver->xmlopt);
model = g_strdup(virDomainNetGetModelString(net));
net->script = NULL;
virDomainNetDefClear(net);
net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
net->info.bootIndex = bootIndex;
net->mac = mac;
net->script = script;
if (virDomainNetSetModelString(net, model) < 0)
if (!newNet)
goto cleanup;
newNet->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
newNet->info.bootIndex = net->info.bootIndex;
newNet->model = net->model;
newNet->modelstr = g_steal_pointer(&net->modelstr);
newNet->mac = net->mac;
newNet->script = g_steal_pointer(&net->script);
virDomainNetDefFree(net);
vm->def->nets[i] = newNet;
}
if (!(cmd = qemuProcessCreatePretendCmd(driver, vm, NULL,