qemu: address: Remove dead code when un-reserving PCI address

The code can't fail so having error handling is pointless.

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 531fc68006a399eb12723d2b572d7746b7fecbea..6422682391b7f56915c72feefcde69954de09a58 100644 (file)
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -687,12 +687,11 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
 }
 
 
-int
+void
 virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
                                virPCIDeviceAddressPtr addr)
 {
     addrs->buses[addr->bus].slot[addr->slot].functions &= ~(1 << addr->function);
-    return 0;
 }
 
 virDomainPCIAddressSetPtr

diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index 205e7cfe5117b10b78919c2cb67a9de36e2125e1..1731014656df992a4280667b43ac896925c41005 100644 (file)
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -166,8 +166,8 @@ int virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
                                   virDomainPCIConnectFlags flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-int virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
-                                   virPCIDeviceAddressPtr addr)
+void virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
+                                    virPCIDeviceAddressPtr addr)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 void virDomainPCIAddressSetAllMulti(virDomainDefPtr def)

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index b94b73eaa23cb878661e13d9db50ece538ec5f0d..7f4ac0f45a9240bcff620de399865f210472f4e4 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -2892,11 +2892,8 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,
     if (!devstr)
         devstr = info->alias;
 
-    if (virDeviceInfoPCIAddressPresent(info) &&
-        virDomainPCIAddressReleaseAddr(priv->pciaddrs,
-                                       &info->addr.pci) < 0)
-        VIR_WARN("Unable to release PCI address on %s",
-                 NULLSTR(devstr));
+    if (virDeviceInfoPCIAddressPresent(info))
+        virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci);
 
     if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB &&
         priv->usbaddrs &&