network: assume DNSMASQ_DHCPv6_SUPPORT

Remove the (now unreachable) error message and the macro.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 40dccf2c151d6f8c3e854d8df7edb9b66ab83744..526485e3f90848f55527acd35adb60e96b053b5e 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -1329,20 +1329,6 @@ networkDnsmasqConfContents(virNetworkObj *obj,
         }
         if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) {
             if (ipdef->nranges || ipdef->nhosts) {
-                if (!DNSMASQ_DHCPv6_SUPPORT(caps)) {
-                    unsigned long version = dnsmasqCapsGetVersion(caps);
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                   _("The version of dnsmasq on this host "
-                                     "(%d.%d) doesn't adequately support "
-                                     "IPv6 dhcp range or dhcp host "
-                                     "specification. Version %d.%d or later "
-                                     "is required."),
-                                   (int)version / 1000000,
-                                   (int)(version % 1000000) / 1000,
-                                   DNSMASQ_DHCPv6_MAJOR_REQD,
-                                   DNSMASQ_DHCPv6_MINOR_REQD);
-                    return -1;
-                }
                 if (ipv6def) {
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                                    _("For IPv6, multiple DHCP definitions "

diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h
index ee9839cd250a0be66437264bc59119d8f070e402..92c5d4129d4421d7e6fabacbe2bb2cee6fa52b92 100644 (file)
--- a/src/util/virdnsmasq.h
+++ b/src/util/virdnsmasq.h
@@ -107,15 +107,9 @@ unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps);
 char *dnsmasqDhcpHostsToString(dnsmasqDhcpHost *hosts,
                                unsigned int nhosts);
 
-#define DNSMASQ_DHCPv6_MAJOR_REQD 2
-#define DNSMASQ_DHCPv6_MINOR_REQD 64
 #define DNSMASQ_RA_MAJOR_REQD 2
 #define DNSMASQ_RA_MINOR_REQD 64
 
-#define DNSMASQ_DHCPv6_SUPPORT(CAPS) \
-    (dnsmasqCapsGetVersion(CAPS) >= \
-     (DNSMASQ_DHCPv6_MAJOR_REQD * 1000000) + \
-     (DNSMASQ_DHCPv6_MINOR_REQD * 1000))
 #define DNSMASQ_RA_SUPPORT(CAPS) \
     (dnsmasqCapsGetVersion(CAPS) >= \
      (DNSMASQ_RA_MAJOR_REQD * 1000000) + \