[libvirt] [PATCH 0/5] qemu: refactor device post parse callback
Main idea was to split the disk code since I'll be changing it later but as I was at it I refactored everything. Peter Krempa (5): qemu: domain: Extract disk post parse code into a function qemu: domain: Extract network device def post parse code qemu: domain: Extract video device def post parse code qemu: domain: Extract panic device def post parse code qemu: domain: Use typecasted enum in qemuDomainDeviceDefPostParse src/qemu/qemu_domain.c | 219 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 144 insertions(+), 75 deletions(-) -- 2.16.2
Later on, more stuff will be added so prevent the main function growing out of control. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 77 ++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ee676a2789..ab0a823f1e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5687,6 +5687,46 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, return 0; } + +static int +qemuDomainDeviceDiskDefPostParse(virDomainDiskDefPtr disk, + virQEMUDriverConfigPtr cfg) +{ + /* set default disk types and drivers */ + /* assign default storage format and driver according to config */ + if (cfg->allowDiskFormatProbing) { + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); + + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format == VIR_STORAGE_FILE_NONE) + disk->mirror->format = VIR_STORAGE_FILE_AUTO; + } else { + /* default driver if probing is forbidden */ + if (!virDomainDiskGetDriver(disk) && + virDomainDiskSetDriver(disk, "qemu") < 0) + return -1; + + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); + + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format == VIR_STORAGE_FILE_NONE) + disk->mirror->format = VIR_STORAGE_FILE_RAW; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5711,40 +5751,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, goto cleanup; } - /* set default disk types and drivers */ - if (dev->type == VIR_DOMAIN_DEVICE_DISK) { - virDomainDiskDefPtr disk = dev->data.disk; - - /* assign default storage format and driver according to config */ - if (cfg->allowDiskFormatProbing) { - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && - (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); - - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format == VIR_STORAGE_FILE_NONE) - disk->mirror->format = VIR_STORAGE_FILE_AUTO; - } else { - /* default driver if probing is forbidden */ - if (!virDomainDiskGetDriver(disk) && - virDomainDiskSetDriver(disk, "qemu") < 0) - goto cleanup; - - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && - (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); - - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format == VIR_STORAGE_FILE_NONE) - disk->mirror->format = VIR_STORAGE_FILE_RAW; - } - } + if (dev->type == VIR_DOMAIN_DEVICE_DISK && + qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0) + goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) { if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { -- 2.16.2
On Thu, May 24, 2018 at 05:22:03PM +0200, Peter Krempa wrote:
Later on, more stuff will be added so prevent the main function growing out of control.
We wouldn't want it to become sentient.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 77 ++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 34 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab0a823f1e..dbdd94de2f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5727,6 +5727,22 @@ qemuDomainDeviceDiskDefPostParse(virDomainDiskDefPtr disk, } +static int +qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net, + const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && + !net->model) { + if (VIR_STRDUP(net->model, + qemuDomainDefaultNetModel(def, qemuCaps)) < 0) + return -1; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5744,12 +5760,8 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, int ret = -1; if (dev->type == VIR_DOMAIN_DEVICE_NET && - dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !dev->data.net->model) { - if (VIR_STRDUP(dev->data.net->model, - qemuDomainDefaultNetModel(def, qemuCaps)) < 0) - goto cleanup; - } + qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCaps) < 0) + goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_DISK && qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0) -- 2.16.2
On Thu, May 24, 2018 at 05:22:04PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dbdd94de2f..e9a8b0c332 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5743,6 +5743,28 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net, } +static int +qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, + const virDomainDef *def) +{ + if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { + if (ARCH_IS_PPC64(def->os.arch)) + video->type = VIR_DOMAIN_VIDEO_TYPE_VGA; + else if (qemuDomainIsVirt(def) || ARCH_IS_S390(def->os.arch)) + video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; + else + video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; + } + + if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && + !video->vgamem) { + video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5767,21 +5789,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0) goto cleanup; - if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) { - if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { - if (ARCH_IS_PPC64(def->os.arch)) - dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_VGA; - else if (qemuDomainIsVirt(def) || ARCH_IS_S390(def->os.arch)) - dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; - else - dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; - } - - if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && - !dev->data.video->vgamem) { - dev->data.video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; - } - } + if (dev->type == VIR_DOMAIN_DEVICE_VIDEO && + qemuDomainDeviceVideoDefPostParse(dev->data.video, def) < 0) + goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_PANIC && dev->data.panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) { -- 2.16.2
On Thu, May 24, 2018 at 05:22:05PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e9a8b0c332..a6b879aa76 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5765,6 +5765,23 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, } +static int +qemuDomainDevicePanicDefPostParse(virDomainPanicDefPtr panic, + const virDomainDef *def) +{ + if (panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) { + if (qemuDomainIsPSeries(def)) + panic->model = VIR_DOMAIN_PANIC_MODEL_PSERIES; + else if (ARCH_IS_S390(def->os.arch)) + panic->model = VIR_DOMAIN_PANIC_MODEL_S390; + else + panic->model = VIR_DOMAIN_PANIC_MODEL_ISA; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5794,14 +5811,8 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_PANIC && - dev->data.panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) { - if (qemuDomainIsPSeries(def)) - dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_PSERIES; - else if (ARCH_IS_S390(def->os.arch)) - dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_S390; - else - dev->data.panic->model = VIR_DOMAIN_PANIC_MODEL_ISA; - } + qemuDomainDevicePanicDefPostParse(dev->data.panic, def) < 0) + goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER && qemuDomainControllerDefPostParse(dev->data.controller, def, -- 2.16.2
On Thu, May 24, 2018 at 05:22:06PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Rather than a lot of checks use a switch statement. This optimizes the code as if one device is matched the rest will certainly not match. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 77 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a6b879aa76..47910acb83 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5798,39 +5798,66 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; - if (dev->type == VIR_DOMAIN_DEVICE_NET && - qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCaps) < 0) - goto cleanup; + switch ((virDomainDeviceType) dev->type) { + case VIR_DOMAIN_DEVICE_NET: + ret = qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCaps); + break; - if (dev->type == VIR_DOMAIN_DEVICE_DISK && - qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_DISK: + ret = qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg); + break; - if (dev->type == VIR_DOMAIN_DEVICE_VIDEO && - qemuDomainDeviceVideoDefPostParse(dev->data.video, def) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_VIDEO: + ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def); + break; - if (dev->type == VIR_DOMAIN_DEVICE_PANIC && - qemuDomainDevicePanicDefPostParse(dev->data.panic, def) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_PANIC: + ret = qemuDomainDevicePanicDefPostParse(dev->data.panic, def); + break; - if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER && - qemuDomainControllerDefPostParse(dev->data.controller, def, - qemuCaps, parseFlags) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_CONTROLLER: + ret = qemuDomainControllerDefPostParse(dev->data.controller, def, + qemuCaps, parseFlags); + break; - if (dev->type == VIR_DOMAIN_DEVICE_SHMEM && - qemuDomainShmemDefPostParse(dev->data.shmem) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_SHMEM: + ret = qemuDomainShmemDefPostParse(dev->data.shmem); + break; - if (dev->type == VIR_DOMAIN_DEVICE_CHR && - qemuDomainChrDefPostParse(dev->data.chr, def, driver, parseFlags) < 0) { - goto cleanup; - } + case VIR_DOMAIN_DEVICE_CHR: + ret = qemuDomainChrDefPostParse(dev->data.chr, def, driver, parseFlags); + break; - ret = 0; + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_HOSTDEV: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_REDIRDEV: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_RNG: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_IOMMU: + ret = 0; + break; + + case VIR_DOMAIN_DEVICE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected VIR_DOMAIN_DEVICE_NONE")); + break; + + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportEnumRangeError(virDomainDeviceType, dev->type); + break; + } - cleanup: virObjectUnref(cfg); return ret; } -- 2.16.2
On Thu, May 24, 2018 at 05:22:07PM +0200, Peter Krempa wrote:
Rather than a lot of checks use a switch statement. This optimizes the code as if one device is matched the rest will certainly not match.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 77 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 25 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa