External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_alias: Rewrite of code pattern

Browse Source 
This patch rewrites the pattern using early return where it is
not needed and changes the return type of the functions to 'void'
if possible.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2021-11-24 17:12:53 +01:00 committed by Michal Privoznik
parent 46caf6bac9
commit e9b7ebee1e
3 changed files with 44 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/qemu/qemu_alias.c
View File

@ -359,75 +359,57 @@ qemuAssignDeviceFSAlias(virDomainDef *def,
} }
static int static void
qemuAssignDeviceSoundAlias(virDomainSoundDef *sound, qemuAssignDeviceSoundAlias(virDomainSoundDef *sound,
int idx) int idx)
{ {
if (sound->info.alias) if (!sound->info.alias)
return 0; sound->info.alias = g_strdup_printf("sound%d", idx);
sound->info.alias = g_strdup_printf("sound%d", idx);
return 0;
} }
static int static void
qemuAssignDeviceVideoAlias(virDomainVideoDef *video, qemuAssignDeviceVideoAlias(virDomainVideoDef *video,
int idx) int idx)
{ {
if (video->info.alias) if (!video->info.alias)
return 0; video->info.alias = g_strdup_printf("video%d", idx);
video->info.alias = g_strdup_printf("video%d", idx);
return 0;
} }
static int static void
qemuAssignDeviceHubAlias(virDomainHubDef *hub, qemuAssignDeviceHubAlias(virDomainHubDef *hub,
int idx) int idx)
{ {
if (hub->info.alias) if (!hub->info.alias)
return 0; hub->info.alias = g_strdup_printf("hub%d", idx);
hub->info.alias = g_strdup_printf("hub%d", idx);
return 0;
} }
static int static void
qemuAssignDeviceSmartcardAlias(virDomainSmartcardDef *smartcard, qemuAssignDeviceSmartcardAlias(virDomainSmartcardDef *smartcard,
int idx) int idx)
{ {
if (smartcard->info.alias) if (!smartcard->info.alias)
return 0; smartcard->info.alias = g_strdup_printf("smartcard%d", idx);
smartcard->info.alias = g_strdup_printf("smartcard%d", idx);
return 0;
} }
static int static void
qemuAssignDeviceMemballoonAlias(virDomainMemballoonDef *memballoon, qemuAssignDeviceMemballoonAlias(virDomainMemballoonDef *memballoon,
int idx) int idx)
{ {
if (memballoon->info.alias) if (!memballoon->info.alias)
return 0; memballoon->info.alias = g_strdup_printf("balloon%d", idx);
memballoon->info.alias = g_strdup_printf("balloon%d", idx);
return 0;
} }
static int static void
qemuAssignDeviceTPMAlias(virDomainTPMDef *tpm, qemuAssignDeviceTPMAlias(virDomainTPMDef *tpm,
int idx) int idx)
{ {
if (tpm->info.alias) if (!tpm->info.alias)
return 0; tpm->info.alias = g_strdup_printf("tpm%d", idx);
tpm->info.alias = g_strdup_printf("tpm%d", idx);
return 0;
} }
@ -583,26 +565,23 @@ qemuAssignDeviceShmemAlias(virDomainDef *def,
} }
int void
qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog) qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog)
{ {
/* Currently, there's just one watchdog per domain */ /* Currently, there's just one watchdog per domain */
if (watchdog->info.alias) if (!watchdog->info.alias)
return 0; watchdog->info.alias = g_strdup("watchdog0");
watchdog->info.alias = g_strdup("watchdog0");
return 0;
} }
int
void
qemuAssignDeviceInputAlias(virDomainDef *def, qemuAssignDeviceInputAlias(virDomainDef *def,
virDomainInputDef *input, virDomainInputDef *input,
int idx) int idx)
{ {
if (input->info.alias) if (input->info.alias)
return 0; return;
if (idx == -1) { if (idx == -1) {
int thisidx; int thisidx;
@ -615,19 +594,14 @@ qemuAssignDeviceInputAlias(virDomainDef *def,
} }
input->info.alias = g_strdup_printf("input%d", idx); input->info.alias = g_strdup_printf("input%d", idx);
return 0;
} }
int void
qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock) qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock)
{ {
if (vsock->info.alias) if (!vsock->info.alias)
return 0; vsock->info.alias = g_strdup("vsock0");
vsock->info.alias = g_strdup("vsock0");
return 0;
} }
@ -650,8 +624,7 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
return -1; return -1;
} }
for (i = 0; i < def->nsounds; i++) { for (i = 0; i < def->nsounds; i++) {
if (qemuAssignDeviceSoundAlias(def->sounds[i], i) < 0) qemuAssignDeviceSoundAlias(def->sounds[i], i);
return -1;
} }
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
/* we can't start assigning at 0, since netdevs may have used /* we can't start assigning at 0, since netdevs may have used
@ -667,16 +640,14 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
return -1; return -1;
} }
for (i = 0; i < def->nvideos; i++) { for (i = 0; i < def->nvideos; i++) {
if (qemuAssignDeviceVideoAlias(def->videos[i], i) < 0) qemuAssignDeviceVideoAlias(def->videos[i], i);
return -1;
} }
for (i = 0; i < def->ncontrollers; i++) { for (i = 0; i < def->ncontrollers; i++) {
if (qemuAssignDeviceControllerAlias(def, def->controllers[i]) < 0) if (qemuAssignDeviceControllerAlias(def, def->controllers[i]) < 0)
return -1; return -1;
} }
for (i = 0; i < def->ninputs; i++) { for (i = 0; i < def->ninputs; i++) {
if (qemuAssignDeviceInputAlias(def, def->inputs[i], i) < 0) qemuAssignDeviceInputAlias(def, def->inputs[i], i);
return -1;
} }
for (i = 0; i < def->nparallels; i++) { for (i = 0; i < def->nparallels; i++) {
if (qemuAssignDeviceChrAlias(def, def->parallels[i], i) < 0) if (qemuAssignDeviceChrAlias(def, def->parallels[i], i) < 0)
@ -695,41 +666,35 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
return -1; return -1;
} }
for (i = 0; i < def->nhubs; i++) { for (i = 0; i < def->nhubs; i++) {
if (qemuAssignDeviceHubAlias(def->hubs[i], i) < 0) qemuAssignDeviceHubAlias(def->hubs[i], i);
return -1;
} }
for (i = 0; i < def->nshmems; i++) { for (i = 0; i < def->nshmems; i++) {
if (qemuAssignDeviceShmemAlias(def, def->shmems[i], i) < 0) if (qemuAssignDeviceShmemAlias(def, def->shmems[i], i) < 0)
return -1; return -1;
} }
for (i = 0; i < def->nsmartcards; i++) { for (i = 0; i < def->nsmartcards; i++) {
if (qemuAssignDeviceSmartcardAlias(def->smartcards[i], i) < 0) qemuAssignDeviceSmartcardAlias(def->smartcards[i], i);
return -1;
} }
if (def->watchdog) { if (def->watchdog) {
if (qemuAssignDeviceWatchdogAlias(def->watchdog) < 0) qemuAssignDeviceWatchdogAlias(def->watchdog);
return -1;
} }
if (def->memballoon && if (def->memballoon &&
def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) { def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) {
if (qemuAssignDeviceMemballoonAlias(def->memballoon, 0) < 0) qemuAssignDeviceMemballoonAlias(def->memballoon, 0);
return -1;
} }
for (i = 0; i < def->nrngs; i++) { for (i = 0; i < def->nrngs; i++) {
if (qemuAssignDeviceRNGAlias(def, def->rngs[i]) < 0) if (qemuAssignDeviceRNGAlias(def, def->rngs[i]) < 0)
return -1; return -1;
} }
for (i = 0; i < def->ntpms; i++) { for (i = 0; i < def->ntpms; i++) {
if (qemuAssignDeviceTPMAlias(def->tpms[i], i) < 0) qemuAssignDeviceTPMAlias(def->tpms[i], i);
return -1;
} }
for (i = 0; i < def->nmems; i++) { for (i = 0; i < def->nmems; i++) {
if (qemuAssignDeviceMemoryAlias(def, def->mems[i], false) < 0) if (qemuAssignDeviceMemoryAlias(def, def->mems[i], false) < 0)
return -1; return -1;
} }
if (def->vsock) { if (def->vsock) {
if (qemuAssignDeviceVsockAlias(def->vsock) < 0) qemuAssignDeviceVsockAlias(def->vsock);
return -1;
} }
return 0; return 0;

10
src/qemu/qemu_alias.h
View File

@ -65,13 +65,13 @@ int qemuAssignDeviceShmemAlias(virDomainDef *def,
virDomainShmemDef *shmem, virDomainShmemDef *shmem,
int idx); int idx);
int qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog); void qemuAssignDeviceWatchdogAlias(virDomainWatchdogDef *watchdog);
int qemuAssignDeviceInputAlias(virDomainDef *def, void qemuAssignDeviceInputAlias(virDomainDef *def,
virDomainInputDef *input, virDomainInputDef *input,
int idx); int idx);
int qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock); void qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock);
int qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps); int qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps);

9
src/qemu/qemu_hotplug.c
View File

@ -3130,8 +3130,7 @@ qemuDomainAttachWatchdog(virQEMUDriver *driver,
return -1; return -1;
} }
if (qemuAssignDeviceWatchdogAlias(watchdog) < 0) qemuAssignDeviceWatchdogAlias(watchdog);
return -1;
if (watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) { if (watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) {
if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) if (qemuDomainEnsurePCIAddress(vm, &dev) < 0)
@ -3239,8 +3238,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver,
bool teardownlabel = false; bool teardownlabel = false;
bool teardowncgroup = false; bool teardowncgroup = false;
if (qemuAssignDeviceInputAlias(vm->def, input, -1) < 0) qemuAssignDeviceInputAlias(vm->def, input, -1);
return -1;
switch ((virDomainInputBus) input->bus) { switch ((virDomainInputBus) input->bus) {
case VIR_DOMAIN_INPUT_BUS_USB: case VIR_DOMAIN_INPUT_BUS_USB:
@ -3359,8 +3357,7 @@ qemuDomainAttachVsockDevice(virQEMUDriver *driver,
if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0) if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0)
return -1; return -1;
if (qemuAssignDeviceVsockAlias(vsock) < 0) qemuAssignDeviceVsockAlias(vsock);
goto cleanup;
if (qemuProcessOpenVhostVsock(vsock) < 0) if (qemuProcessOpenVhostVsock(vsock) < 0)
goto cleanup; goto cleanup;