]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Remove unnecessary NULL arg check
authorJohn Ferlan <jferlan@redhat.com>
Mon, 17 Oct 2016 14:46:00 +0000 (10:46 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 17 Oct 2016 19:38:32 +0000 (15:38 -0400)
qemuDomainSecret{Disk|Hostdev}Prepare has a prototype that checks for
ATTRIBUTE_NONNULL(1) for 'conn'.

Signed-off-by: John Ferlan <jferlan@redhat.com>
src/qemu/qemu_domain.c

index 0c9416f61d1e1b852cda9445bbc75c1d4c4dcfe8..5e9f08f01c871c5bb05b068a9c257b6903d6fdd4 100644 (file)
@@ -1062,9 +1062,6 @@ qemuDomainSecretDiskPrepare(virConnectPtr conn,
     qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     qemuDomainSecretInfoPtr secinfo = NULL;
 
-    if (!conn)
-        return 0;
-
     if (qemuDomainSecretDiskCapable(src)) {
         virSecretUsageType secretUsageType = VIR_SECRET_USAGE_TYPE_ISCSI;
 
@@ -1147,7 +1144,7 @@ qemuDomainSecretHostdevPrepare(virConnectPtr conn,
     virDomainHostdevSubsysPtr subsys = &hostdev->source.subsys;
     qemuDomainSecretInfoPtr secinfo = NULL;
 
-    if (conn && hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
+    if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
         subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
 
         virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;