[libvirt] [PATCH] qemuDomainDeviceDefPostParse: Drop useless check

Martin Kletzander mkletzan at redhat.com
Wed Sep 23 09:43:11 UTC 2015


On Wed, Sep 23, 2015 at 10:05:13AM +0200, Michal Privoznik wrote:
>Now that virQEMUDriverCreateXMLConf is never called with NULL
>(after 086f37e97aab) we can safely drop useless check in
>qemuDomainDeviceDefPostParse as we are guaranteed to be always
>called with the driver initialized. Therefore checking if driver
>is NULL makes no sense. Moreover, if we mix it with direct driver
>dereference.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/qemu/qemu_domain.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
>diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
>index 7d92f3a..8e3a7d3 100644
>--- a/src/qemu/qemu_domain.c
>+++ b/src/qemu/qemu_domain.c
>@@ -1233,12 +1233,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
> {
>     virQEMUDriverPtr driver = opaque;
>     virQEMUCapsPtr qemuCaps = NULL;
>-    virQEMUDriverConfigPtr cfg = NULL;
>+    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
>     int ret = -1;
>
>-    if (driver)
>-        cfg = virQEMUDriverGetConfig(driver);
>-

It's nice, but since you're cleaning it up, this makes another check
for (cfg) below useless as well.

>     qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
>
>     if (dev->type == VIR_DOMAIN_DEVICE_NET &&
>--
>2.4.9
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150923/9ef40459/attachment-0001.sig>


More information about the libvir-list mailing list