External/libvirt
1
0
Fork 0
Code

qemu_domain_namespace: Drop unused @cfg argument

Browse Source 
There is a lot of functions called from
qemuDomainBuildNamespace() that accept @cfg
(virQEMUDriverConfigPtr) as an argument and don't use it.
Historically, it was done so that all qemuDomainSetupAll*()
functions look the same.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2020-07-21 12:57:49 +02:00
parent 764eaf1aa4
commit 68a4320b95
1 changed files with 34 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/qemu/qemu_namespace.c
View File

@ -486,8 +486,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg,
static int static int
qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupDisk(virDomainDiskDefPtr disk,
virDomainDiskDefPtr disk,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
virStorageSourcePtr next; virStorageSourcePtr next;
@ -545,16 +544,14 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllDisks(virQEMUDriverConfigPtr cfg, qemuDomainSetupAllDisks(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
size_t i; size_t i;
VIR_DEBUG("Setting up disks"); VIR_DEBUG("Setting up disks");
for (i = 0; i < vm->def->ndisks; i++) { for (i = 0; i < vm->def->ndisks; i++) {
if (qemuDomainSetupDisk(cfg, if (qemuDomainSetupDisk(vm->def->disks[i],
vm->def->disks[i],
data) < 0) data) < 0)
return -1; return -1;
} }
@ -565,8 +562,7 @@ qemuDomainSetupAllDisks(virQEMUDriverConfigPtr cfg,
static int static int
qemuDomainSetupHostdev(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupHostdev(virDomainHostdevDefPtr dev,
virDomainHostdevDefPtr dev,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
g_autofree char *path = NULL; g_autofree char *path = NULL;
@ -586,16 +582,14 @@ qemuDomainSetupHostdev(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllHostdevs(virQEMUDriverConfigPtr cfg, qemuDomainSetupAllHostdevs(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
size_t i; size_t i;
VIR_DEBUG("Setting up hostdevs"); VIR_DEBUG("Setting up hostdevs");
for (i = 0; i < vm->def->nhostdevs; i++) { for (i = 0; i < vm->def->nhostdevs; i++) {
if (qemuDomainSetupHostdev(cfg, if (qemuDomainSetupHostdev(vm->def->hostdevs[i],
vm->def->hostdevs[i],
data) < 0) data) < 0)
return -1; return -1;
} }
@ -605,8 +599,7 @@ qemuDomainSetupAllHostdevs(virQEMUDriverConfigPtr cfg,
static int static int
qemuDomainSetupMemory(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupMemory(virDomainMemoryDefPtr mem,
virDomainMemoryDefPtr mem,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM) if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM)
@ -617,16 +610,14 @@ qemuDomainSetupMemory(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllMemories(virQEMUDriverConfigPtr cfg, qemuDomainSetupAllMemories(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
size_t i; size_t i;
VIR_DEBUG("Setting up memories"); VIR_DEBUG("Setting up memories");
for (i = 0; i < vm->def->nmems; i++) { for (i = 0; i < vm->def->nmems; i++) {
if (qemuDomainSetupMemory(cfg, if (qemuDomainSetupMemory(vm->def->mems[i],
vm->def->mems[i],
data) < 0) data) < 0)
return -1; return -1;
} }
@ -656,8 +647,7 @@ qemuDomainSetupChardev(virDomainDefPtr def G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupAllChardevs(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
VIR_DEBUG("Setting up chardevs"); VIR_DEBUG("Setting up chardevs");
@ -674,8 +664,7 @@ qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupTPM(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupTPM(virDomainTPMDefPtr dev,
virDomainTPMDefPtr dev,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
switch (dev->type) { switch (dev->type) {
@ -696,8 +685,7 @@ qemuDomainSetupTPM(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllTPMs(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupAllTPMs(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
size_t i; size_t i;
@ -705,7 +693,7 @@ qemuDomainSetupAllTPMs(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
VIR_DEBUG("Setting up TPMs"); VIR_DEBUG("Setting up TPMs");
for (i = 0; i < vm->def->ntpms; i++) { for (i = 0; i < vm->def->ntpms; i++) {
if (qemuDomainSetupTPM(cfg, vm->def->tpms[i], data) < 0) if (qemuDomainSetupTPM(vm->def->tpms[i], data) < 0)
return -1; return -1;
} }
@ -715,8 +703,7 @@ qemuDomainSetupAllTPMs(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupGraphics(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupGraphics(virDomainGraphicsDefPtr gfx,
virDomainGraphicsDefPtr gfx,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
const char *rendernode = virDomainGraphicsGetRenderNode(gfx); const char *rendernode = virDomainGraphicsGetRenderNode(gfx);
@ -729,16 +716,14 @@ qemuDomainSetupGraphics(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllGraphics(virQEMUDriverConfigPtr cfg, qemuDomainSetupAllGraphics(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
size_t i; size_t i;
VIR_DEBUG("Setting up graphics"); VIR_DEBUG("Setting up graphics");
for (i = 0; i < vm->def->ngraphics; i++) { for (i = 0; i < vm->def->ngraphics; i++) {
if (qemuDomainSetupGraphics(cfg, if (qemuDomainSetupGraphics(vm->def->graphics[i],
vm->def->graphics[i],
data) < 0) data) < 0)
return -1; return -1;
} }
@ -749,8 +734,7 @@ qemuDomainSetupAllGraphics(virQEMUDriverConfigPtr cfg,
static int static int
qemuDomainSetupInput(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupInput(virDomainInputDefPtr input,
virDomainInputDefPtr input,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
const char *path = virDomainInputDefGetPath(input); const char *path = virDomainInputDefGetPath(input);
@ -763,16 +747,14 @@ qemuDomainSetupInput(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllInputs(virQEMUDriverConfigPtr cfg, qemuDomainSetupAllInputs(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
size_t i; size_t i;
VIR_DEBUG("Setting up inputs"); VIR_DEBUG("Setting up inputs");
for (i = 0; i < vm->def->ninputs; i++) { for (i = 0; i < vm->def->ninputs; i++) {
if (qemuDomainSetupInput(cfg, if (qemuDomainSetupInput(vm->def->inputs[i],
vm->def->inputs[i],
data) < 0) data) < 0)
return -1; return -1;
} }
@ -782,8 +764,7 @@ qemuDomainSetupAllInputs(virQEMUDriverConfigPtr cfg,
static int static int
qemuDomainSetupRNG(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupRNG(virDomainRNGDefPtr rng,
virDomainRNGDefPtr rng,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
switch ((virDomainRNGBackend) rng->backend) { switch ((virDomainRNGBackend) rng->backend) {
@ -804,16 +785,14 @@ qemuDomainSetupRNG(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupAllRNGs(virQEMUDriverConfigPtr cfg, qemuDomainSetupAllRNGs(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
size_t i; size_t i;
VIR_DEBUG("Setting up RNGs"); VIR_DEBUG("Setting up RNGs");
for (i = 0; i < vm->def->nrngs; i++) { for (i = 0; i < vm->def->nrngs; i++) {
if (qemuDomainSetupRNG(cfg, if (qemuDomainSetupRNG(vm->def->rngs[i],
vm->def->rngs[i],
data) < 0) data) < 0)
return -1; return -1;
} }
@ -824,8 +803,7 @@ qemuDomainSetupAllRNGs(virQEMUDriverConfigPtr cfg,
static int static int
qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupLoader(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
virDomainLoaderDefPtr loader = vm->def->os.loader; virDomainLoaderDefPtr loader = vm->def->os.loader;
@ -860,8 +838,7 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
static int static int
qemuDomainSetupLaunchSecurity(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, qemuDomainSetupLaunchSecurity(virDomainObjPtr vm,
virDomainObjPtr vm,
const struct qemuDomainCreateDeviceData *data) const struct qemuDomainCreateDeviceData *data)
{ {
virDomainSEVDefPtr sev = vm->def->sev; virDomainSEVDefPtr sev = vm->def->sev;
@ -923,34 +900,34 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
if (qemuDomainSetupDev(cfg, mgr, vm, &data) < 0) if (qemuDomainSetupDev(cfg, mgr, vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllDisks(cfg, vm, &data) < 0) if (qemuDomainSetupAllDisks(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllHostdevs(cfg, vm, &data) < 0) if (qemuDomainSetupAllHostdevs(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllMemories(cfg, vm, &data) < 0) if (qemuDomainSetupAllMemories(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllChardevs(cfg, vm, &data) < 0) if (qemuDomainSetupAllChardevs(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllTPMs(cfg, vm, &data) < 0) if (qemuDomainSetupAllTPMs(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllGraphics(cfg, vm, &data) < 0) if (qemuDomainSetupAllGraphics(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllInputs(cfg, vm, &data) < 0) if (qemuDomainSetupAllInputs(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupAllRNGs(cfg, vm, &data) < 0) if (qemuDomainSetupAllRNGs(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupLoader(cfg, vm, &data) < 0) if (qemuDomainSetupLoader(vm, &data) < 0)
goto cleanup; goto cleanup;
if (qemuDomainSetupLaunchSecurity(cfg, vm, &data) < 0) if (qemuDomainSetupLaunchSecurity(vm, &data) < 0)
goto cleanup; goto cleanup;
/* Save some mount points because we want to share them with the host */ /* Save some mount points because we want to share them with the host */