From 5c27b6f1e341d9ef41aa55f4a97a4d40d46229a3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 25 2017 13:29:36 +0000
Subject: import libvirt-2.0.0-10.el7_3.9


---

diff --git a/SOURCES/libvirt-Add-support-for-CPU-cache-specification.patch b/SOURCES/libvirt-Add-support-for-CPU-cache-specification.patch
new file mode 100644
index 0000000..74a11e8
--- /dev/null
+++ b/SOURCES/libvirt-Add-support-for-CPU-cache-specification.patch
@@ -0,0 +1,388 @@
+From ea48ec29c4f2d53b7aee1db79e63e01a4272c666 Mon Sep 17 00:00:00 2001
+Message-Id: <ea48ec29c4f2d53b7aee1db79e63e01a4272c666@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Mon, 24 Apr 2017 15:40:07 +0200
+Subject: [PATCH] Add support for CPU cache specification
+
+This patch introduces
+
+    <cache level='N' mode='emulate'/>
+    <cache mode='passthrough'/>
+    <cache mode='disable'/>
+
+sub element of /domain/cpu. Currently only a single <cache> element is
+allowed.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit a646a6016a7c62688988f7cfaa22e1340c2ce761)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1447612
+
+Conflicts:
+	docs/formatdomain.html.in -- indentation changes not backported
+	docs/schemas/cputypes.rng -- CPU types were not separated from
+            domaincommon.rng
+	src/conf/cpu_conf.c -- virCPUDefCopyWithoutModel was not
+            separated from virCPUDefCopy
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/formatdomain.html.in                          | 35 +++++++++++++
+ docs/schemas/domaincommon.rng                      | 24 +++++++++
+ src/conf/cpu_conf.c                                | 58 ++++++++++++++++++++++
+ src/conf/cpu_conf.h                                | 19 +++++++
+ src/libvirt_private.syms                           |  2 +
+ .../generic-cpu-cache-disable.xml                  | 20 ++++++++
+ .../generic-cpu-cache-emulate.xml                  | 20 ++++++++
+ .../generic-cpu-cache-passthrough.xml              | 20 ++++++++
+ tests/genericxml2xmltest.c                         |  4 ++
+ 9 files changed, 202 insertions(+)
+ create mode 100644 tests/genericxml2xmlindata/generic-cpu-cache-disable.xml
+ create mode 100644 tests/genericxml2xmlindata/generic-cpu-cache-emulate.xml
+ create mode 100644 tests/genericxml2xmlindata/generic-cpu-cache-passthrough.xml
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index e9b7bad9a..cbaf078ff 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -1175,6 +1175,7 @@
+     &lt;model fallback='allow'&gt;core2duo&lt;/model&gt;
+     &lt;vendor&gt;Intel&lt;/vendor&gt;
+     &lt;topology sockets='1' cores='2' threads='1'/&gt;
++    &lt;cache level='3' mode='emulate'/&gt;
+     &lt;feature policy='disable' name='lahf_lm'/&gt;
+   &lt;/cpu&gt;
+   ...</pre>
+@@ -1188,6 +1189,7 @@
+ 
+ <pre>
+   &lt;cpu mode='host-passthrough'&gt;
++    &lt;cache mode='passthrough'/&gt;
+     &lt;feature policy='disable' name='lahf_lm'/&gt;
+   ...</pre>
+ 
+@@ -1365,6 +1367,39 @@
+         <span class="since">Since 0.8.5</span> the <code>policy</code>
+         attribute can be omitted and will default to <code>require</code>.
+       </dd>
++
++      <dt><code>cache</code></dt>
++      <dd><span class="since">Since 3.3.0</span> the <code>cache</code>
++        element describes the virtual CPU cache. If the element is missing,
++        the hypervisor will use a sensible default.
++
++        <dl>
++          <dt><code>level</code></dt>
++          <dd>This optional attribute specifies which cache level is described
++            by the element. Missing attribute means the element describes all
++            CPU cache levels at once. Mixing <code>cache</code> elements with
++            the <code>level</code> attribute set and those without the
++            attribute is forbidden.</dd>
++
++          <dt><code>mode</code></dt>
++          <dd>
++            The following values are supported:
++            <dl>
++              <dt><code>emulate</code></dt>
++              <dd>The hypervisor will provide a fake CPU cache data.</dd>
++
++              <dt><code>passthrough</code></dt>
++              <dd>The real CPU cache data reported by the host CPU will be
++                passed through to the virtual CPU.</dd>
++
++              <dt><code>disable</code></dt>
++              <dd>The virtual CPU will report no CPU cache of the specified
++                level (or no cache at all if the <code>level</code> attribute
++                is missing).</dd>
++            </dl>
++          </dd>
++        </dl>
++      </dd>
+     </dl>
+ 
+     <p>
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 6acc107c3..bd2823ff7 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -4388,6 +4388,9 @@
+         <optional>
+           <ref name="cpuNuma"/>
+         </optional>
++        <optional>
++          <ref name="cpuCache"/>
++        </optional>
+       </interleave>
+     </element>
+   </define>
+@@ -4511,6 +4514,27 @@
+     </element>
+   </define>
+ 
++  <define name="cpuCache">
++    <element name="cache">
++      <optional>
++        <attribute name="level">
++          <choice>
++            <value>1</value>
++            <value>2</value>
++            <value>3</value>
++          </choice>
++        </attribute>
++      </optional>
++      <attribute name="mode">
++        <choice>
++          <value>emulate</value>
++          <value>passthrough</value>
++          <value>disable</value>
++        </choice>
++      </attribute>
++    </element>
++  </define>
++
+   <!--
+       System information specification:
+        Placeholder for system specific informations likes the ones
+diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
+index 9ffaf1e95..d16864a9f 100644
+--- a/src/conf/cpu_conf.c
++++ b/src/conf/cpu_conf.c
+@@ -56,6 +56,12 @@ VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST,
+               "disable",
+               "forbid")
+ 
++VIR_ENUM_IMPL(virCPUCacheMode, VIR_CPU_CACHE_MODE_LAST,
++              "emulate",
++              "passthrough",
++              "disable")
++
++
+ void ATTRIBUTE_NONNULL(1)
+ virCPUDefFreeModel(virCPUDefPtr def)
+ {
+@@ -77,6 +83,7 @@ virCPUDefFree(virCPUDefPtr def)
+         return;
+ 
+     virCPUDefFreeModel(def);
++    VIR_FREE(def->cache);
+     VIR_FREE(def);
+ }
+ 
+@@ -131,6 +138,13 @@ virCPUDefCopy(const virCPUDef *cpu)
+     copy->threads = cpu->threads;
+     copy->arch = cpu->arch;
+ 
++    if (cpu->cache) {
++        if (VIR_ALLOC(copy->cache) < 0)
++            goto error;
++
++        *copy->cache = *cpu->cache;
++    }
++
+     if (virCPUDefCopyModel(copy, cpu, false) < 0)
+         goto error;
+ 
+@@ -389,6 +403,41 @@ virCPUDefParseXML(xmlNodePtr node,
+         def->features[i].policy = policy;
+     }
+ 
++    if (virXPathInt("count(./cache)", ctxt, &n) < 0) {
++        goto cleanup;
++    } else if (n > 1) {
++        virReportError(VIR_ERR_XML_ERROR, "%s",
++                       _("at most one CPU cache element may be specified"));
++        goto cleanup;
++    } else if (n == 1) {
++        int level = -1;
++        char *strmode;
++        int mode;
++
++        if (virXPathBoolean("boolean(./cache[1]/@level)", ctxt) == 1 &&
++            (virXPathInt("string(./cache[1]/@level)", ctxt, &level) < 0 ||
++             level < 1 || level > 3)) {
++            virReportError(VIR_ERR_XML_ERROR, "%s",
++                           _("invalid CPU cache level, must be in range [1,3]"));
++            goto cleanup;
++        }
++
++        if (!(strmode = virXPathString("string(./cache[1]/@mode)", ctxt)) ||
++            (mode = virCPUCacheModeTypeFromString(strmode)) < 0) {
++            VIR_FREE(strmode);
++            virReportError(VIR_ERR_XML_ERROR, "%s",
++                           _("missing or invalid CPU cache mode"));
++            goto cleanup;
++        }
++        VIR_FREE(strmode);
++
++        if (VIR_ALLOC(def->cache) < 0)
++            goto cleanup;
++
++        def->cache->level = level;
++        def->cache->mode = mode;
++    }
++
+  cleanup:
+     ctxt->node = oldnode;
+     VIR_FREE(fallback);
+@@ -557,6 +606,15 @@ virCPUDefFormatBuf(virBufferPtr buf,
+         virBufferAddLit(buf, "/>\n");
+     }
+ 
++    if (def->cache) {
++        virBufferAddLit(buf, "<cache ");
++        if (def->cache->level != -1)
++            virBufferAsprintf(buf, "level='%d' ", def->cache->level);
++        virBufferAsprintf(buf, "mode='%s'",
++                          virCPUCacheModeTypeToString(def->cache->mode));
++        virBufferAddLit(buf, "/>\n");
++    }
++
+     for (i = 0; i < def->nfeatures; i++) {
+         virCPUFeatureDefPtr feature = def->features + i;
+ 
+diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
+index 705ba6d90..53541d15f 100644
+--- a/src/conf/cpu_conf.h
++++ b/src/conf/cpu_conf.h
+@@ -92,6 +92,24 @@ struct _virCPUFeatureDef {
+ };
+ 
+ 
++typedef enum {
++    VIR_CPU_CACHE_MODE_EMULATE,
++    VIR_CPU_CACHE_MODE_PASSTHROUGH,
++    VIR_CPU_CACHE_MODE_DISABLE,
++
++    VIR_CPU_CACHE_MODE_LAST
++} virCPUCacheMode;
++
++VIR_ENUM_DECL(virCPUCacheMode);
++
++typedef struct _virCPUCacheDef virCPUCacheDef;
++typedef virCPUCacheDef *virCPUCacheDefPtr;
++struct _virCPUCacheDef {
++    int level;          /* -1 for unspecified */
++    virCPUCacheMode mode;
++};
++
++
+ typedef struct _virCPUDef virCPUDef;
+ typedef virCPUDef *virCPUDefPtr;
+ struct _virCPUDef {
+@@ -109,6 +127,7 @@ struct _virCPUDef {
+     size_t nfeatures;
+     size_t nfeatures_max;
+     virCPUFeatureDefPtr features;
++    virCPUCacheDefPtr cache;
+ };
+ 
+ 
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index e2dbee92d..bfeb1e58f 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -63,6 +63,8 @@ virCapabilitiesSetNetPrefix;
+ 
+ 
+ # conf/cpu_conf.h
++virCPUCacheModeTypeFromString;
++virCPUCacheModeTypeToString;
+ virCPUDefAddFeature;
+ virCPUDefCopy;
+ virCPUDefCopyModel;
+diff --git a/tests/genericxml2xmlindata/generic-cpu-cache-disable.xml b/tests/genericxml2xmlindata/generic-cpu-cache-disable.xml
+new file mode 100644
+index 000000000..25f65cc6e
+--- /dev/null
++++ b/tests/genericxml2xmlindata/generic-cpu-cache-disable.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache mode='disable'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/genericxml2xmlindata/generic-cpu-cache-emulate.xml b/tests/genericxml2xmlindata/generic-cpu-cache-emulate.xml
+new file mode 100644
+index 000000000..6ea57cbf6
+--- /dev/null
++++ b/tests/genericxml2xmlindata/generic-cpu-cache-emulate.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache level='3' mode='emulate'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/genericxml2xmlindata/generic-cpu-cache-passthrough.xml b/tests/genericxml2xmlindata/generic-cpu-cache-passthrough.xml
+new file mode 100644
+index 000000000..8d4c186c9
+--- /dev/null
++++ b/tests/genericxml2xmlindata/generic-cpu-cache-passthrough.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache mode='passthrough'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
+index 2ea239648..17afc1dc9 100644
+--- a/tests/genericxml2xmltest.c
++++ b/tests/genericxml2xmltest.c
+@@ -99,6 +99,10 @@ mymain(void)
+ 
+     DO_TEST("vcpus-individual");
+ 
++    DO_TEST("cpu-cache-emulate");
++    DO_TEST("cpu-cache-passthrough");
++    DO_TEST("cpu-cache-disable");
++
+     virObjectUnref(caps);
+     virObjectUnref(xmlopt);
+ 
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-Increase-default-file-handle-limits-for-daemons.patch b/SOURCES/libvirt-Increase-default-file-handle-limits-for-daemons.patch
new file mode 100644
index 0000000..f9f8bbf
--- /dev/null
+++ b/SOURCES/libvirt-Increase-default-file-handle-limits-for-daemons.patch
@@ -0,0 +1,81 @@
+From a5ceaa8601794b7a60726c7fed5bf29dde15c9b2 Mon Sep 17 00:00:00 2001
+Message-Id: <a5ceaa8601794b7a60726c7fed5bf29dde15c9b2@dist-git>
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Thu, 13 Apr 2017 13:36:31 -0400
+Subject: [PATCH] Increase default file handle limits for daemons
+
+Linux still defaults to a 1024 open file handle limit. This causes
+scalability problems for libvirtd / virtlockd / virtlogd on large
+hosts which might want > 1024 guest to be running. In fact if each
+guest needs > 1 FD, we can't even get to 500 guests. This is not
+good enough when we see machines with 100's of physical cores and
+TBs of RAM.
+
+In comparison to other memory requirements of libvirtd & related
+daemons, the resource usage associated with open file handles
+is essentially line noise. It is thus reasonable to increase the
+limits unconditionally for all installs.
+
+Resolves: https://bugzilla.redhat.com/1442043 (RHEL7.3.z)
+Resolves: https://bugzilla.redhat.com/1429551 (RHEL7.4)
+
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+(cherry picked from commit 27cd76350021d36b9bd8b187ce5c8919659e3806)
+---
+ daemon/libvirtd.service.in       | 7 +++++--
+ src/locking/virtlockd.service.in | 4 ++++
+ src/logging/virtlogd.service.in  | 5 +++++
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
+index bbf27dae9..5f5d35edb 100644
+--- a/daemon/libvirtd.service.in
++++ b/daemon/libvirtd.service.in
+@@ -23,8 +23,11 @@ ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+-# Override the maximum number of opened files
+-#LimitNOFILE=2048
++# At least 1 FD per guest, often 2 (eg qemu monitor + qemu agent).
++# eg if we want to support 4096 guests, we'll typically need 8192 FDs
++# If changing this, also consider virtlogd.service & virtlockd.service
++# limits which are also related to number of guests
++LimitNOFILE=8192
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 57089b046..4907e3290 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -12,6 +12,10 @@ ExecReload=/bin/kill -USR1 $MAINPID
+ # cause the machine to be fenced (rebooted), so make
+ # sure we discourage OOM killer
+ OOMScoreAdjust=-900
++# Needs to allow for max guests * average disks per guest
++# libvirtd.service written to expect 4096 guests, so if we
++# allow for 4 disks per guest, we get:
++LimitNOFILE=16384
+ 
+ [Install]
+ Also=virtlockd.socket
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index 09e074014..8b67317cb 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -13,6 +13,11 @@ ExecReload=/bin/kill -USR1 $MAINPID
+ # cause the machine to be fenced (rebooted), so make
+ # sure we discourage OOM killer
+ OOMScoreAdjust=-900
++# Need to have at least one file open per guest (eg QEMU
++# stdio log), but might be more (eg serial console logs)
++# libvirtd.service written to expect 4096 guests, so if we
++# guess at 2 log files per guest here (stdio + 1 serial):
++LimitNOFILE=8192
+ 
+ [Install]
+ Also=virtlogd.socket
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-RHEL-qemuxml2argvtest-Properly-reset-host-CPU-arch.patch b/SOURCES/libvirt-RHEL-qemuxml2argvtest-Properly-reset-host-CPU-arch.patch
new file mode 100644
index 0000000..09b07b3
--- /dev/null
+++ b/SOURCES/libvirt-RHEL-qemuxml2argvtest-Properly-reset-host-CPU-arch.patch
@@ -0,0 +1,37 @@
+From eb83a2ac219b229580faaae38422b7129076b70a Mon Sep 17 00:00:00 2001
+Message-Id: <eb83a2ac219b229580faaae38422b7129076b70a@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 4 May 2017 10:41:43 +0200
+Subject: [PATCH] RHEL: qemuxml2argvtest: Properly reset host CPU arch
+
+RHEL-only, upstream reworked the way host CPUs and architectures are
+set.
+
+driver.caps->host.cpu->arch and cpuDefault point to the same structure
+and the line did not really do anything leaving the host CPU arch set to
+VIR_ARCH_AARCH64. Without this fix qemuxml2argvtest would segfault after
+the following patch.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1447612
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ tests/qemuxml2argvtest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index dc5580e02..cbf785e1b 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1956,7 +1956,7 @@ mymain(void)
+     DO_TEST_FAILURE("aarch64-kvm-32-on-64",
+             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
+             QEMU_CAPS_KVM);
+-    driver.caps->host.cpu->arch = cpuDefault->arch;
++    driver.caps->host.cpu->arch = VIR_ARCH_X86_64;
+ 
+     DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY);
+     DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT);
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-conf-Rename-mode-parameter-in-virCPUDefParseXML.patch b/SOURCES/libvirt-conf-Rename-mode-parameter-in-virCPUDefParseXML.patch
new file mode 100644
index 0000000..7fde20c
--- /dev/null
+++ b/SOURCES/libvirt-conf-Rename-mode-parameter-in-virCPUDefParseXML.patch
@@ -0,0 +1,53 @@
+From 199cd8f7c434fb1248ba3338bd9e402ffe7bc57b Mon Sep 17 00:00:00 2001
+Message-Id: <199cd8f7c434fb1248ba3338bd9e402ffe7bc57b@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Mon, 24 Apr 2017 15:38:41 +0200
+Subject: [PATCH] conf: Rename mode parameter in virCPUDefParseXML
+
+The type of this parameter is virCPUType so calling it 'mode' is pretty
+strange, 'type' is a much better name.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit e841a41169dd726af13f29cb57fbafe658b7011a)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1447612
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/conf/cpu_conf.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
+index b71528ef5..9ffaf1e95 100644
+--- a/src/conf/cpu_conf.c
++++ b/src/conf/cpu_conf.c
+@@ -144,7 +144,7 @@ virCPUDefCopy(const virCPUDef *cpu)
+ virCPUDefPtr
+ virCPUDefParseXML(xmlNodePtr node,
+                   xmlXPathContextPtr ctxt,
+-                  virCPUType mode)
++                  virCPUType type)
+ {
+     virCPUDefPtr def;
+     xmlNodePtr *nodes = NULL;
+@@ -164,7 +164,7 @@ virCPUDefParseXML(xmlNodePtr node,
+     if (VIR_ALLOC(def) < 0)
+         return NULL;
+ 
+-    if (mode == VIR_CPU_TYPE_AUTO) {
++    if (type == VIR_CPU_TYPE_AUTO) {
+         if (virXPathBoolean("boolean(./arch)", ctxt)) {
+             if (virXPathBoolean("boolean(./@match)", ctxt)) {
+                 virReportError(VIR_ERR_XML_ERROR, "%s",
+@@ -177,7 +177,7 @@ virCPUDefParseXML(xmlNodePtr node,
+             def->type = VIR_CPU_TYPE_GUEST;
+         }
+     } else {
+-        def->type = mode;
++        def->type = type;
+     }
+ 
+     if ((cpuMode = virXMLPropString(node, "mode"))) {
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-qemu-Add-support-for-guest-CPU-cache.patch b/SOURCES/libvirt-qemu-Add-support-for-guest-CPU-cache.patch
new file mode 100644
index 0000000..b641675
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Add-support-for-guest-CPU-cache.patch
@@ -0,0 +1,628 @@
+From b638d9571e6497978c350e86671d9161c0b4c314 Mon Sep 17 00:00:00 2001
+Message-Id: <b638d9571e6497978c350e86671d9161c0b4c314@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 25 Apr 2017 19:07:19 +0200
+Subject: [PATCH] qemu: Add support for guest CPU cache
+
+This patch maps /domain/cpu/cache element into -cpu parameters:
+
+- <cache mode='passthrough'/> is translated to host-cache-info=on
+- <cache level='3' mode='emulate'/> is transformed into l3-cache=on
+- <cache mode='disable'/> is turned in host-cache-info=off,l3-cache=off
+
+Any other <cache> element is forbidden.
+
+The tricky part is detecting whether QEMU supports the CPU properties.
+
+The 'host-cache-info' property is introduced in v2.4.0-1389-ge265e3e480,
+earlier QEMU releases enabled host-cache-info by default and had no way
+to disable it. If the property is present, it defaults to 'off' for any
+QEMU until at least 2.9.0.
+
+The 'l3-cache' property was introduced later by v2.7.0-200-g14c985cffa.
+Earlier versions worked as if l3-cache=off was passed. For any QEMU
+until at least 2.9.0 l3-cache is 'off' by default.
+
+QEMU 2.9.0 was the first release which supports probing both properties
+by running device-list-properties with typename=host-x86_64-cpu. Older
+QEMU releases did not support device-list-properties command for CPU
+devices. Thus we can't really rely on probing them and we can just use
+query-cpu-model-expansion QMP command as a witness.
+
+Because the cache property probing is only reliable for QEMU >= 2.9.0
+when both are already supported for quite a few releases, we let QEMU
+report an error if a specific cache mode is explicitly requested. The
+other mode (or both if a user requested CPU cache to be disabled) is
+explicitly turned off for QEMU >= 2.9.0 to avoid any surprises in case
+the QEMU defaults change. Any older QEMU already turns them off so not
+doing so explicitly does not make any harm.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit df13c0b477ffda460eed259c3b8aab7255f11199)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1447612
+
+Conflicts:
+    - mostly context onflicts
+    - qemuDomainDefCPUPostParse did not exist in 7.3
+    - QEMU_CAPS_CPU_CACHE capability was not backported because it
+      depends on non-existent QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION and
+      thus it would never be set anyway; in other words, l3-cache=off
+      and host-cache-info=off will never be used
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_command.c                            | 23 ++++++++
+ src/qemu/qemu_domain.c                             | 67 ++++++++++++++++++++++
+ .../qemuxml2argv-cpu-cache-disable.args            | 21 +++++++
+ .../qemuxml2argv-cpu-cache-disable.xml             | 20 +++++++
+ .../qemuxml2argv-cpu-cache-disable2.args           | 21 +++++++
+ .../qemuxml2argv-cpu-cache-disable2.xml            | 20 +++++++
+ .../qemuxml2argv-cpu-cache-disable3.args           | 22 +++++++
+ .../qemuxml2argv-cpu-cache-disable3.xml            | 20 +++++++
+ .../qemuxml2argv-cpu-cache-emulate-l2.xml          | 20 +++++++
+ .../qemuxml2argv-cpu-cache-emulate-l3.args         | 21 +++++++
+ .../qemuxml2argv-cpu-cache-emulate-l3.xml          | 20 +++++++
+ .../qemuxml2argv-cpu-cache-passthrough-l3.xml      | 20 +++++++
+ .../qemuxml2argv-cpu-cache-passthrough.args        | 21 +++++++
+ .../qemuxml2argv-cpu-cache-passthrough.xml         | 20 +++++++
+ .../qemuxml2argv-cpu-cache-passthrough2.args       | 21 +++++++
+ .../qemuxml2argv-cpu-cache-passthrough2.xml        | 20 +++++++
+ .../qemuxml2argv-cpu-cache-passthrough3.xml        | 20 +++++++
+ tests/qemuxml2argvtest.c                           |  9 +++
+ 18 files changed, 406 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l2.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough-l3.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.xml
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough3.xml
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index bd01a0f76..f5b41257c 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -6854,6 +6854,29 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
+         have_cpu = true;
+     }
+ 
++    if (def->cpu && def->cpu->cache) {
++        virCPUCacheDefPtr cache = def->cpu->cache;
++
++        if (!have_cpu) {
++            virBufferAdd(&buf, default_model, -1);
++            have_cpu = true;
++        }
++
++        switch (cache->mode) {
++        case VIR_CPU_CACHE_MODE_EMULATE:
++            virBufferAddLit(&buf, ",l3-cache=on");
++            break;
++
++        case VIR_CPU_CACHE_MODE_PASSTHROUGH:
++            virBufferAddLit(&buf, ",host-cache-info=on");
++            break;
++
++        case VIR_CPU_CACHE_MODE_DISABLE:
++        case VIR_CPU_CACHE_MODE_LAST:
++            break;
++        }
++    }
++
+     if (virBufferCheckError(&buf) < 0)
+         goto cleanup;
+ 
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index b91db229f..7aa6de742 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2328,6 +2328,70 @@ qemuDomainDefVcpusPostParse(virDomainDefPtr def)
+ 
+ 
+ static int
++qemuDomainDefCPUPostParse(virDomainDefPtr def)
++{
++    if (!def->cpu)
++        return 0;
++
++    if (def->cpu->cache) {
++        virCPUCacheDefPtr cache = def->cpu->cache;
++
++        if (!ARCH_IS_X86(def->os.arch)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("CPU cache specification is not supported "
++                             "for '%s' architecture"),
++                           virArchToString(def->os.arch));
++            return -1;
++        }
++
++        switch (cache->mode) {
++        case VIR_CPU_CACHE_MODE_EMULATE:
++            if (cache->level != 3) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("CPU cache mode '%s' can only be used with "
++                                 "level='3'"),
++                               virCPUCacheModeTypeToString(cache->mode));
++                return -1;
++            }
++            break;
++
++        case VIR_CPU_CACHE_MODE_PASSTHROUGH:
++            if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("CPU cache mode '%s' can only be used with "
++                                 "'%s' CPUs"),
++                               virCPUCacheModeTypeToString(cache->mode),
++                               virCPUModeTypeToString(VIR_CPU_MODE_HOST_PASSTHROUGH));
++                return -1;
++            }
++
++            if (cache->level != -1) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("unsupported CPU cache level for mode '%s'"),
++                               virCPUCacheModeTypeToString(cache->mode));
++                return -1;
++            }
++            break;
++
++        case VIR_CPU_CACHE_MODE_DISABLE:
++            if (cache->level != -1) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("unsupported CPU cache level for mode '%s'"),
++                               virCPUCacheModeTypeToString(cache->mode));
++                return -1;
++            }
++            break;
++
++        case VIR_CPU_CACHE_MODE_LAST:
++            break;
++        }
++    }
++
++    return 0;
++}
++
++
++static int
+ qemuDomainDefPostParse(virDomainDefPtr def,
+                        virCapsPtr caps,
+                        unsigned int parseFlags,
+@@ -2385,6 +2449,9 @@ qemuDomainDefPostParse(virDomainDefPtr def,
+     if (qemuDomainDefVcpusPostParse(def) < 0)
+         goto cleanup;
+ 
++    if (qemuDomainDefCPUPostParse(def) < 0)
++        goto cleanup;
++
+     ret = 0;
+  cleanup:
+     virObjectUnref(qemuCaps);
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args
+new file mode 100644
+index 000000000..9348e01f8
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args
+@@ -0,0 +1,21 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/home/test \
++USER=test \
++LOGNAME=test \
++QEMU_AUDIO_DRV=none \
++/usr/bin/kvm \
++-name foo \
++-S \
++-M pc \
++-cpu host \
++-m 214 \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-nographic \
++-nodefaults \
++-monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \
++-no-acpi \
++-boot c \
++-usb \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.xml
+new file mode 100644
+index 000000000..e6f39951c
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache mode='disable'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args
+new file mode 100644
+index 000000000..9348e01f8
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args
+@@ -0,0 +1,21 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/home/test \
++USER=test \
++LOGNAME=test \
++QEMU_AUDIO_DRV=none \
++/usr/bin/kvm \
++-name foo \
++-S \
++-M pc \
++-cpu host \
++-m 214 \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-nographic \
++-nodefaults \
++-monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \
++-no-acpi \
++-boot c \
++-usb \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.xml
+new file mode 100644
+index 000000000..e6f39951c
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache mode='disable'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args
+new file mode 100644
+index 000000000..bbfd5ba2c
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args
+@@ -0,0 +1,22 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/home/test \
++USER=test \
++LOGNAME=test \
++QEMU_AUDIO_DRV=none \
++/usr/bin/kvm \
++-name foo \
++-S \
++-M pc \
++-cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
+++lahf_lm \
++-m 214 \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-nographic \
++-nodefaults \
++-monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \
++-no-acpi \
++-boot c \
++-usb \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.xml
+new file mode 100644
+index 000000000..17078a1e8
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-model'>
++    <cache mode='disable'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l2.xml
+new file mode 100644
+index 000000000..0d1652e5c
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l2.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-model'>
++    <cache level='2' mode='emulate'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args
+new file mode 100644
+index 000000000..0b9fb18e9
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args
+@@ -0,0 +1,21 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/home/test \
++USER=test \
++LOGNAME=test \
++QEMU_AUDIO_DRV=none \
++/usr/bin/kvm \
++-name foo \
++-S \
++-M pc \
++-cpu host,l3-cache=on \
++-m 214 \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-nographic \
++-nodefaults \
++-monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \
++-no-acpi \
++-boot c \
++-usb \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.xml
+new file mode 100644
+index 000000000..17019c673
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache level='3' mode='emulate'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough-l3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough-l3.xml
+new file mode 100644
+index 000000000..3471115ea
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough-l3.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache level='3' mode='passthrough'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args
+new file mode 100644
+index 000000000..d7863ba2e
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args
+@@ -0,0 +1,21 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/home/test \
++USER=test \
++LOGNAME=test \
++QEMU_AUDIO_DRV=none \
++/usr/bin/kvm \
++-name foo \
++-S \
++-M pc \
++-cpu host,host-cache-info=on \
++-m 214 \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-nographic \
++-nodefaults \
++-monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \
++-no-acpi \
++-boot c \
++-usb \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.xml
+new file mode 100644
+index 000000000..74846fdd3
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache mode='passthrough'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args
+new file mode 100644
+index 000000000..d7863ba2e
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args
+@@ -0,0 +1,21 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/home/test \
++USER=test \
++LOGNAME=test \
++QEMU_AUDIO_DRV=none \
++/usr/bin/kvm \
++-name foo \
++-S \
++-M pc \
++-cpu host,host-cache-info=on \
++-m 214 \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-nographic \
++-nodefaults \
++-monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \
++-no-acpi \
++-boot c \
++-usb \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.xml
+new file mode 100644
+index 000000000..74846fdd3
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-passthrough'>
++    <cache mode='passthrough'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough3.xml
+new file mode 100644
+index 000000000..6ad65700b
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough3.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>foo</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu mode='host-model'>
++    <cache mode='passthrough'/>
++  </cpu>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index cbf785e1b..3cc798782 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -2117,6 +2117,15 @@ mymain(void)
+ 
+     DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
+ 
++    DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM);
++    DO_TEST("cpu-cache-disable2", QEMU_CAPS_KVM);
++    DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM);
++    DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM);
++    DO_TEST("cpu-cache-passthrough2", QEMU_CAPS_KVM);
++    DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM);
++    DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM);
++    DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM);
++    DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM);
+     qemuTestDriverFree(&driver);
+ 
+     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-qemu-Allow-empty-script-path-to-interface.patch b/SOURCES/libvirt-qemu-Allow-empty-script-path-to-interface.patch
new file mode 100644
index 0000000..7ac6f68
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Allow-empty-script-path-to-interface.patch
@@ -0,0 +1,47 @@
+From 7a081e92617f2f05e9ef29d3eb65b557e7375815 Mon Sep 17 00:00:00 2001
+Message-Id: <7a081e92617f2f05e9ef29d3eb65b557e7375815@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 6 Mar 2017 16:20:57 +0100
+Subject: [PATCH] qemu: Allow empty script path to <interface/>
+
+RHEL-7.4: https://bugzilla.redhat.com/show_bug.cgi?id=1412834
+RHEL-7.3.z: https://bugzilla.redhat.com/show_bug.cgi?id=1429510
+
+Before 9c17d665fdc5f (v1.3.2 - I know, right?) it was possible to
+have the following interface configuration:
+
+  <interface type='ethernet'/>
+    <script path=''/>
+  </interface>
+
+This resulted in -netdev tap,script=,.. Fortunately, qemu helped
+us to get away with this as it just ignored the empty script
+path. However, after the commit mentioned above it's libvirtd
+who is executing the script. Unfortunately without special
+case-ing empty script path.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 1d9ab0f04af310e52f80b4281751655bb3bb7601)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/util/virnetdev.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index fa695d4a6..d12324878 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -2615,6 +2615,10 @@ virNetDevRunEthernetScript(const char *ifname, const char *script)
+     virCommandPtr cmd;
+     int ret;
+ 
++    /* Not a bug! Previously we did accept script="" as a NO-OP. */
++    if (STREQ(script, ""))
++        return 0;
++
+     cmd = virCommandNew(script);
+     virCommandAddArgFormat(cmd, "%s", ifname);
+     virCommandClearCaps(cmd);
+-- 
+2.12.0
+
diff --git a/SOURCES/libvirt-qemuDomainAttachNetDevice-Support-attach-of-type-user.patch b/SOURCES/libvirt-qemuDomainAttachNetDevice-Support-attach-of-type-user.patch
new file mode 100644
index 0000000..42c82a3
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainAttachNetDevice-Support-attach-of-type-user.patch
@@ -0,0 +1,37 @@
+From d099685b1b297c8c8016a464cac2375e6ebcd762 Mon Sep 17 00:00:00 2001
+Message-Id: <d099685b1b297c8c8016a464cac2375e6ebcd762@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 25 Apr 2017 17:38:46 +0200
+Subject: [PATCH] qemuDomainAttachNetDevice: Support attach of type="user"
+
+RHEL-7.4: https://bugzilla.redhat.com/show_bug.cgi?id=1420668
+RHEL-7.3.z: https://bugzilla.redhat.com/show_bug.cgi?id=1445231
+
+This has worked in previous releases.
+My commit c266b60440 broke it.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 9d87f769726bd5714eb6a930379d8b4c53311196)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_hotplug.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index b7302a5f9..df4a67ea3 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -1063,6 +1063,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
+         break;
+ 
+     case VIR_DOMAIN_NET_TYPE_USER:
++        /* No preparation needed. */
++        break;
++
+     case VIR_DOMAIN_NET_TYPE_SERVER:
+     case VIR_DOMAIN_NET_TYPE_CLIENT:
+     case VIR_DOMAIN_NET_TYPE_MCAST:
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-after-hostdev-assignment-restore-VF-MAC-address-via-setting-admin-MAC.patch b/SOURCES/libvirt-util-after-hostdev-assignment-restore-VF-MAC-address-via-setting-admin-MAC.patch
new file mode 100644
index 0000000..07914d2
--- /dev/null
+++ b/SOURCES/libvirt-util-after-hostdev-assignment-restore-VF-MAC-address-via-setting-admin-MAC.patch
@@ -0,0 +1,80 @@
+From f97142c91f965c0087fcf99122bcd7c0777ef287 Mon Sep 17 00:00:00 2001
+Message-Id: <f97142c91f965c0087fcf99122bcd7c0777ef287@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:34 -0400
+Subject: [PATCH] util: after hostdev assignment, restore VF MAC address via
+ setting admin MAC
+
+It takes longer to explain this than to fix it...
+
+In the past we weren't able to save the VF's own MAC address *at all*
+when using it for hostdev assignment, because we had already unbound
+the VF from the host net driver prior to saving its config. With the
+previous patch, that problem has been solved, so we now have the VF's
+MAC address saved and can move on to the *next* problem, which is twofold:
+
+1) during teardown we restore the config before we've re-bound, so the
+   VF doesn't have a net driver, and thus we can't set its MAC address
+   directly.
+
+2) even if we delay restoring the config until the VF is bound to a
+   net driver, the request to set its MAC address would fail, since
+   (during device setup) we had set the "admin MAC" for the VF via an
+   RTM_SETLINK to the PF - once you've set the admin MAC for a VF, the
+   VF driver (either on host or on guest) is not allowed to change the
+   VF's MAC address "forever" (well, until you reload the PF driver,
+   but that requires destroying and recreating every single VF, which
+   isn't something you can require).
+
+The solution is to keep the restoration of config at the same place,
+but to set the *admin MAC* to the address you want the VF to have -
+when the VF net driver is later initialized (as a part of re-binding
+to the VF net driver) its MAC will be initialized to the current value
+of the admin MAC.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit d6ef331f112ab51af7d14c59cd0b460c2e9609a8)
+---
+ src/util/virhostdev.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index f07e50d2c..fe87fa7d7 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -544,6 +544,30 @@ virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
+                                          &adminMAC, &vlan, &MAC);
+ 
+         if (ret == 0) {
++            /* if a MAC was stored for the VF, we should now restore
++             * that as the adminMAC. We have to do it this way because
++             * the VF is still not bound to the host's net driver, so
++             * we can't directly set its MAC (and even after it is
++             * re-bound to the host net driver, it will still have its
++             * "administratively set" flag on, and that prohibits the
++             * VF's net driver from directly setting the MAC
++             * anyway). But it we set the desired VF MAC as the "admin
++             * MAC" *now*, then when the VF is re-bound to the host
++             * net driver (which will happen soon after returning from
++             * this function), that adminMAC will be set (by the PF)
++             * as the VF's new initial MAC.
++             *
++             * If no MAC was stored for the VF, that means it wasn't
++             * bound to a net driver before we used it anyway, so the
++             * adminMAC is all we have, and we can just restore it
++             * directly.
++             */
++            if (MAC) {
++                VIR_FREE(adminMAC);
++                adminMAC = MAC;
++                MAC = NULL;
++            }
++
+             ignore_value(virNetDevSetNetConfig(linkdev, vf,
+                                                adminMAC, vlan, MAC, true));
+         }
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-allow-ignoring-SIOCSIFHWADDR-when-errno-is-EPERM.patch b/SOURCES/libvirt-util-allow-ignoring-SIOCSIFHWADDR-when-errno-is-EPERM.patch
new file mode 100644
index 0000000..1c0959c
--- /dev/null
+++ b/SOURCES/libvirt-util-allow-ignoring-SIOCSIFHWADDR-when-errno-is-EPERM.patch
@@ -0,0 +1,80 @@
+From 2386cc610a24c88e45741f04bc63445b3542a512 Mon Sep 17 00:00:00 2001
+Message-Id: <2386cc610a24c88e45741f04bc63445b3542a512@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 23 Apr 2017 21:33:53 -0400
+Subject: [PATCH] util: allow ignoring SIOCSIFHWADDR when errno is EPERM
+
+Commit f4ef3a71 made a variation of virNetDevSetMAC that would return
+without logging an error message if errno was set to
+EADDRNOTAVAIL. This errno is set by some SRIOV VF drivers (in
+particular igbvf) when they fail to set the device's MAC address due
+to the PF driver refusing the request. This is useful if we want to
+try a different method of setting the VF MAC address before giving up
+(Commit 86556e16 actually does this, setting the desired MAC address
+to the "admin MAC in the PF, then detaching and reattaching the VF
+netdev driver to force a reinit of the MAC address).
+
+During testing of Bug 1442040 it was discovered that the ixgbe driver
+returns EPERM in this situation, so this patch changes the exception
+case for silent+non-terminal failure to account for this difference.
+
+Completes resolution to: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+                         https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 997134fb8b17eef6eba439303b382b239996208b)
+---
+ src/util/virnetdev.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index 37e47d165..6f933740a 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -226,7 +226,8 @@ int virNetDevExists(const char *ifname)
+  * virNetDevSetMACInternal:
+  * @ifname: interface name to set MTU for
+  * @macaddr: MAC address
+- * @quiet: true if a failure to set MAC address with errno == EADDRNOTAVAIL
++ * @quiet: true if a failure to set MAC address with
++ *         errno == EADDRNOTAVAIL || errno == EPERM
+  *         should be silent (still returns error, but without log)
+  *
+  * This function sets the @macaddr for a given interface @ifname.
+@@ -258,7 +259,8 @@ virNetDevSetMACInternal(const char *ifname,
+ 
+     if (ioctl(fd, SIOCSIFHWADDR, &ifr) < 0) {
+ 
+-        if (quiet && errno == EADDRNOTAVAIL)
++        if (quiet &&
++            (errno == EADDRNOTAVAIL || errno == EPERM))
+             goto cleanup;
+ 
+         virReportSystemError(errno,
+@@ -305,7 +307,8 @@ virNetDevSetMACInternal(const char *ifname,
+         ifr.ifr_addr.sa_len = VIR_MAC_BUFLEN;
+ 
+         if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) {
+-            if (quiet && errno == EADDRNOTAVAIL)
++            if (quiet &&
++                (errno == EADDRNOTAVAIL || errno == EPERM))
+                 goto cleanup;
+ 
+             virReportSystemError(errno,
+@@ -2150,11 +2153,12 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+             int retries = 100;
+ 
+             /* if pfDevOrig == NULL, this isn't a VF, so we've failed */
+-            if (!pfDevOrig || errno != EADDRNOTAVAIL)
++            if (!pfDevOrig ||
++                (errno != EADDRNOTAVAIL && errno != EPERM))
+                 goto cleanup;
+ 
+             /* Otherwise this is a VF, and virNetDevSetMAC failed with
+-             * EADDRNOTAVAIL, which could be due to the
++             * EADDRNOTAVAIL/EPERM, which could be due to the
+              * "administratively set" flag being set in the PF for
+              * this VF.  When this happens, we can attempt to use an
+              * alternate method to set the VF MAC: first set it into
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-change-virPCIGetNetName-to-not-return-error-if-device-has-no-net-name.patch b/SOURCES/libvirt-util-change-virPCIGetNetName-to-not-return-error-if-device-has-no-net-name.patch
new file mode 100644
index 0000000..12c9b42
--- /dev/null
+++ b/SOURCES/libvirt-util-change-virPCIGetNetName-to-not-return-error-if-device-has-no-net-name.patch
@@ -0,0 +1,160 @@
+From 5862ba139392fab763092ccffcb109eb8e5b52a9 Mon Sep 17 00:00:00 2001
+Message-Id: <5862ba139392fab763092ccffcb109eb8e5b52a9@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:24 -0400
+Subject: [PATCH] util: change virPCIGetNetName() to not return error if device
+ has no net name
+
+...and cleanup the callers to report it when it *is* an error.
+
+In many cases It's useful for virPCIGetNetName() to not log an error
+and simply return a NULL pointer when the given device isn't bound to
+a net driver (e.g. we're looking at a VF that is permanently bound to
+vfio-pci). The existing code would silently return an error in this
+case, which could eventually lead to the dreaded "An error occurred
+but the cause is unknown" log message.
+
+This patch changes virPCIGetNetName() to still return success if the
+device simply isn't bound to a net driver, and adjusts all the callers
+that require a non-null netname to check for that condition and log an
+error when it happens.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit d6ee56d723761d408eeef32a96e3c118e0e742c2)
+---
+ src/util/virhostdev.c | 13 +++++++++++++
+ src/util/virnetdev.c  | 19 +++++++++++++++++--
+ src/util/virpci.c     | 32 +++++++++++++++++++++++---------
+ 3 files changed, 53 insertions(+), 11 deletions(-)
+
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index 1e4bb1e7d..93b69501c 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -313,8 +313,21 @@ virHostdevNetDevice(virDomainHostdevDefPtr hostdev, char **linkdev,
+                                          vf) < 0)
+             goto cleanup;
+     } else {
++        /* In practice this should never happen, since we currently
++         * only support assigning SRIOV VFs via <interface
++         * type='hostdev'>, and it is only those devices that should
++         * end up calling this function.
++         */
+         if (virPCIGetNetName(sysfs_path, linkdev) < 0)
+             goto cleanup;
++
++        if (!linkdev) {
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("The device at %s has no network device name"),
++                             sysfs_path);
++            goto cleanup;
++        }
++
+         *vf = -1;
+     }
+ 
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index 30a4a01ee..766638dd3 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1162,6 +1162,9 @@ virNetDevGetVirtualFunctions(const char *pfname,
+         }
+ 
+         if (virPCIGetNetName(pci_sysfs_device_link, &((*vfname)[i])) < 0)
++            goto cleanup;
++
++        if (!(*vfname)[i])
+             VIR_INFO("VF does not have an interface name");
+     }
+ 
+@@ -1258,10 +1261,22 @@ virNetDevGetPhysicalFunction(const char *ifname, char **pfname)
+     if (virNetDevSysfsDeviceFile(&physfn_sysfs_path, ifname, "physfn") < 0)
+         return ret;
+ 
+-    ret = virPCIGetNetName(physfn_sysfs_path, pfname);
++    if (virPCIGetNetName(physfn_sysfs_path, pfname) < 0)
++        goto cleanup;
+ 
++    if (!*pfname) {
++        /* this shouldn't be possible. A VF can't exist unless its
++         * PF device is bound to a network driver
++         */
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("The PF device for VF %s has no network device name"),
++                       ifname);
++        goto cleanup;
++    }
++
++    ret = 0;
++ cleanup:
+     VIR_FREE(physfn_sysfs_path);
+-
+     return ret;
+ }
+ 
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index 132948d32..f6d1e48c7 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -2683,8 +2683,11 @@ virPCIGetNetName(char *device_link_sysfs_path, char **netname)
+         return -1;
+     }
+ 
+-    if (virDirOpenQuiet(&dir, pcidev_sysfs_net_path) < 0)
++    if (virDirOpenQuiet(&dir, pcidev_sysfs_net_path) < 0) {
++        /* this *isn't* an error - caller needs to check for netname == NULL */
++        ret = 0;
+         goto out;
++    }
+ 
+     while (virDirRead(dir, &entry, pcidev_sysfs_net_path) > 0) {
+         /* Assume a single directory entry */
+@@ -2710,24 +2713,35 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,
+     int ret = -1;
+ 
+     if (virPCIGetPhysicalFunction(vf_sysfs_device_path, &pf_config_address) < 0)
+-        return ret;
++        goto cleanup;
+ 
+     if (!pf_config_address)
+-        return ret;
++        goto cleanup;
+ 
+     if (virPCIDeviceAddressGetSysfsFile(pf_config_address,
+                                         &pf_sysfs_device_path) < 0) {
+-
+-        VIR_FREE(pf_config_address);
+-        return ret;
++        goto cleanup;
+     }
+ 
+-    if (virPCIGetVirtualFunctionIndex(pf_sysfs_device_path, vf_sysfs_device_path,
+-                                      vf_index) < 0)
++    if (virPCIGetVirtualFunctionIndex(pf_sysfs_device_path,
++                                      vf_sysfs_device_path, vf_index) < 0) {
++        goto cleanup;
++    }
++
++    if (virPCIGetNetName(pf_sysfs_device_path, pfname) < 0)
+         goto cleanup;
+ 
+-    ret = virPCIGetNetName(pf_sysfs_device_path, pfname);
++    if (!*pfname) {
++        /* this shouldn't be possible. A VF can't exist unless its
++         * PF device is bound to a network driver
++         */
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("The PF device for VF %s has no network device name"),
++                       vf_sysfs_device_path);
++        goto cleanup;
++    }
+ 
++    ret = 0;
+  cleanup:
+     VIR_FREE(pf_config_address);
+     VIR_FREE(pf_sysfs_device_path);
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-eliminate-useless-local-variable.patch b/SOURCES/libvirt-util-eliminate-useless-local-variable.patch
new file mode 100644
index 0000000..660f581
--- /dev/null
+++ b/SOURCES/libvirt-util-eliminate-useless-local-variable.patch
@@ -0,0 +1,60 @@
+From 2e92e9904792f9f69d3d6c51a47eb1238064ee12 Mon Sep 17 00:00:00 2001
+Message-Id: <2e92e9904792f9f69d3d6c51a47eb1238064ee12@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:22 -0400
+Subject: [PATCH] util: eliminate useless local variable
+
+vf in virNetDevMacVLanDeleteWithVPortProfile() is initialized to -1
+and never set. It's not set for a good reason - because it doesn't
+make sense during macvtap device setup to refer to a VF device as
+"PF:VF#". This patch replaces the two uses of "vf" with "-1", and
+removes the local variable, so that it's more clear we are always
+calling the utility functions with vf set to -1.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 606a01339563b5371f21a9b2c10ef818c0557fb1)
+---
+ src/util/virnetdevmacvlan.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
+index 88a0f9485..61da55415 100644
+--- a/src/util/virnetdevmacvlan.c
++++ b/src/util/virnetdevmacvlan.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2010-2016 Red Hat, Inc.
++ * Copyright (C) 2010-2017 Red Hat, Inc.
+  * Copyright (C) 2010-2012 IBM Corporation
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -1190,14 +1190,13 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
+                                            char *stateDir)
+ {
+     int ret = 0;
+-    int vf = -1;
+ 
+     if (ifname) {
+         if (virNetDevVPortProfileDisassociate(ifname,
+                                               virtPortProfile,
+                                               macaddr,
+                                               linkdev,
+-                                              vf,
++                                              -1,
+                                               VIR_NETDEV_VPORT_PROFILE_OP_DESTROY) < 0)
+             ret = -1;
+         if (virNetDevMacVLanDelete(ifname) < 0)
+@@ -1210,7 +1209,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
+              virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH)
+             ignore_value(virNetDevRestoreMacAddress(linkdev, stateDir));
+         else
+-            ignore_value(virNetDevRestoreNetConfig(linkdev, vf, stateDir));
++            ignore_value(virNetDevRestoreNetConfig(linkdev, -1, stateDir));
+     }
+ 
+     virNetlinkEventRemoveClient(0, macaddr, NETLINK_ROUTE);
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-if-setting-admin-MAC-to-00-00-00-00-00-00-fails-try-02-00-00-00-00-00.patch b/SOURCES/libvirt-util-if-setting-admin-MAC-to-00-00-00-00-00-00-fails-try-02-00-00-00-00-00.patch
new file mode 100644
index 0000000..9ee6597
--- /dev/null
+++ b/SOURCES/libvirt-util-if-setting-admin-MAC-to-00-00-00-00-00-00-fails-try-02-00-00-00-00-00.patch
@@ -0,0 +1,120 @@
+From 458aa8587e750e7b368e1a86208841a082242ce5 Mon Sep 17 00:00:00 2001
+Message-Id: <458aa8587e750e7b368e1a86208841a082242ce5@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:36 -0400
+Subject: [PATCH] util: if setting admin MAC to 00:00:00:00:00:00 fails, try
+ 02:00:00:00:00:00
+
+Some PF drivers allow setting the admin MAC (that is the MAC address
+that the VF will be initialized to the next time the VF's driver is
+loaded) to 00:00:00:00:00:00, and some don't. Multiple drivers
+initialize the admin MACs to all 0, but don't allow setting it to that
+very same value. It has been an uphill battle convincing the driver
+people that it's reasonable to expect The argument that's used is
+that an all 0 device MAC address on a device is invalid; however, from
+an outsider's point of view, when the admin MAC is set to 0 at the
+time the VF driver is loaded, the VF's MAC is *not* set to 0, but to a
+random non-0 value. But that's beside the point - even if I could
+convince one or two SRIOV driver maintainers to permit setting the
+admin MAC to 0, there are still several other drivers.
+
+So rather than fighting that losing battle, this patch checks for a
+failure to set the admin MAC due to an all 0 value, and retries it
+with 02:00:00:00:00:00. That won't result in a random value being set
+in the VF MAC at next VF driver init, but that's okay, because we
+always want to set a specific value anyway. Rather, the "almost 0"
+setting makes it easy to visually detect from the output of "ip link
+show" which VFs are currently in use and which are free.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit d5f4abefc231a71e21e33e0d2eb4da8f22552c70)
+---
+ src/util/virnetdev.c | 42 ++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 38 insertions(+), 4 deletions(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index 4739f573a..0223877ff 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1391,6 +1391,14 @@ virNetDevSysfsFile(char **pf_sysfs_device_link ATTRIBUTE_UNUSED,
+ #if defined(__linux__) && defined(HAVE_LIBNL) && defined(IFLA_VF_MAX)
+ 
+ 
++static virMacAddr zeroMAC = { .addr = { 0, 0, 0, 0, 0, 0 } };
++
++/* if a net driver doesn't allow setting MAC to all 0, try setting
++ * to this (the only bit that is set is the "locally administered" bit")
++ */
++static virMacAddr altZeroMAC = { .addr = { 2, 0, 0, 0, 0, 0 } };
++
++
+ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
+     [IFLA_VF_MAC]       = { .type = NLA_UNSPEC,
+                             .maxlen = sizeof(struct ifla_vf_mac) },
+@@ -1401,7 +1409,8 @@ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
+ 
+ static int
+ virNetDevSetVfConfig(const char *ifname, int vf,
+-                     const virMacAddr *macaddr, int vlanid)
++                     const virMacAddr *macaddr, int vlanid,
++                     bool *allowRetry)
+ {
+     int rc = -1;
+     struct nlmsghdr *resp = NULL;
+@@ -1478,7 +1487,15 @@ virNetDevSetVfConfig(const char *ifname, int vf,
+         if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err)))
+             goto malformed_resp;
+ 
+-        if (err->error) {
++        /* if allowRetry is true and the error was EINVAL, then
++         * silently return a failure so the caller can retry with a
++         * different MAC address
++         */
++        if (err->error == -EINVAL && *allowRetry &&
++            macaddr && !virMacAddrCmp(macaddr, &zeroMAC)) {
++            goto cleanup;
++        } else if (err->error) {
++            /* other errors are permanent */
+             char macstr[VIR_MAC_STRING_BUFLEN];
+ 
+             virReportSystemError(-err->error,
+@@ -1490,6 +1507,7 @@ virNetDevSetVfConfig(const char *ifname, int vf,
+                                  vlanid,
+                                  ifname ? ifname : "(unspecified)",
+                                  vf);
++            *allowRetry = false; /* no use retrying */
+             goto cleanup;
+         }
+         break;
+@@ -2126,8 +2144,24 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+          * guest or host). if there is a vlanTag to set, it will take
+          * effect immediately though.
+          */
+-        if (virNetDevSetVfConfig(pfDevName, vf, adminMAC, vlanTag) < 0)
+-            goto cleanup;
++        bool allowRetry = true;
++
++        if (virNetDevSetVfConfig(pfDevName, vf,
++                                 adminMAC, vlanTag, &allowRetry) < 0) {
++            /* allowRetry will still be true if the failure was due to
++             * trying to set the MAC address to all 0. In that case,
++             * we can retry with "altZeroMAC", which is just an all-0 MAC
++             * with the "locally administered" bit set.
++             */
++            if (!allowRetry)
++                goto cleanup;
++
++            allowRetry = false;
++            if (virNetDevSetVfConfig(pfDevName, vf,
++                                     &altZeroMAC, vlanTag, &allowRetry) < 0) {
++                goto cleanup;
++            }
++        }
+     }
+ 
+     ret = 0;
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-log-all-setting-of-MAC-addresses-and-vlan-tags.patch b/SOURCES/libvirt-util-log-all-setting-of-MAC-addresses-and-vlan-tags.patch
new file mode 100644
index 0000000..9710097
--- /dev/null
+++ b/SOURCES/libvirt-util-log-all-setting-of-MAC-addresses-and-vlan-tags.patch
@@ -0,0 +1,93 @@
+From 243d1e0bc40312d06b967a1d4800a69cc518777f Mon Sep 17 00:00:00 2001
+Message-Id: <243d1e0bc40312d06b967a1d4800a69cc518777f@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:38 -0400
+Subject: [PATCH] util: log all setting of MAC addresses and vlan tags
+
+Having this information available will make it easier to determine the
+culprit when MAC or vlan tag appear to not be set, eg.:
+
+  https://bugzilla.redhat.com/1364073
+
+(This patch doesn't fix that bug, just makes it easier to diagnose)
+
+(cherry picked from commit 6ec36b06999cad155b75ed07ef656905b8a45180)
+
+https://bugzilla.redhat.com/1442040
+---
+ src/util/virnetdev.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index a510ebc2e..37e47d165 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -241,6 +241,7 @@ virNetDevSetMACInternal(const char *ifname,
+     int fd = -1;
+     int ret = -1;
+     struct ifreq ifr;
++    char macstr[VIR_MAC_STRING_BUFLEN];
+ 
+     if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0)
+         return -1;
+@@ -256,7 +257,6 @@ virNetDevSetMACInternal(const char *ifname,
+     virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data);
+ 
+     if (ioctl(fd, SIOCSIFHWADDR, &ifr) < 0) {
+-        char macstr[VIR_MAC_STRING_BUFLEN];
+ 
+         if (quiet && errno == EADDRNOTAVAIL)
+             goto cleanup;
+@@ -270,6 +270,10 @@ virNetDevSetMACInternal(const char *ifname,
+     ret = 0;
+ 
+  cleanup:
++    VIR_DEBUG("SIOCSIFHWADDR %s MAC=%s - %s",
++              ifname, virMacAddrFormat(macaddr, macstr),
++              ret < 0 ? "Fail" : "Success");
++
+     VIR_FORCE_CLOSE(fd);
+     return ret;
+ }
+@@ -312,6 +316,9 @@ virNetDevSetMACInternal(const char *ifname,
+ 
+         ret = 0;
+  cleanup:
++        VIR_DEBUG("SIOCSIFLLADDR %s MAC=%s - %s", ifname, mac + 1),
++                  ret < 0 ? "Fail" : "Success");
++
+         VIR_FORCE_CLOSE(s);
+ 
+         return ret;
+@@ -1439,6 +1446,7 @@ virNetDevSetVfConfig(const char *ifname, int vf,
+                      bool *allowRetry)
+ {
+     int rc = -1;
++    char macstr[VIR_MAC_STRING_BUFLEN];
+     struct nlmsghdr *resp = NULL;
+     struct nlmsgerr *err;
+     unsigned int recvbuflen = 0;
+@@ -1522,8 +1530,6 @@ virNetDevSetVfConfig(const char *ifname, int vf,
+             goto cleanup;
+         } else if (err->error) {
+             /* other errors are permanent */
+-            char macstr[VIR_MAC_STRING_BUFLEN];
+-
+             virReportSystemError(-err->error,
+                                  _("Cannot set interface MAC/vlanid to %s/%d "
+                                    "for ifname %s vf %d"),
+@@ -1547,6 +1553,11 @@ virNetDevSetVfConfig(const char *ifname, int vf,
+ 
+     rc = 0;
+  cleanup:
++    VIR_DEBUG("RTM_SETLINK %s vf %d MAC=%s vlanid=%d - %s",
++              ifname, vf,
++              macaddr ? virMacAddrFormat(macaddr, macstr) : "(unchanged)",
++              vlanid, rc < 0 ? "Fail" : "Success");
++
+     nlmsg_free(nl_msg);
+     VIR_FREE(resp);
+     return rc;
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-make-virMacAddrParse-more-versatile.patch b/SOURCES/libvirt-util-make-virMacAddrParse-more-versatile.patch
new file mode 100644
index 0000000..cd14cfd
--- /dev/null
+++ b/SOURCES/libvirt-util-make-virMacAddrParse-more-versatile.patch
@@ -0,0 +1,34 @@
+From 4ff07d06055d17b19f5f43bfbefcda58931a08a5 Mon Sep 17 00:00:00 2001
+Message-Id: <4ff07d06055d17b19f5f43bfbefcda58931a08a5@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:23 -0400
+Subject: [PATCH] util: make virMacAddrParse more versatile
+
+Previously the MAC address text was required to be terminated with a
+NULL. After this, it can be terminated with a space or any control
+character.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 30b07a425d7b5b3ac7ca68d3574692ac6415ccbe)
+---
+ src/util/virmacaddr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
+index 612a409d0..7afe032b9 100644
+--- a/src/util/virmacaddr.c
++++ b/src/util/virmacaddr.c
+@@ -169,7 +169,7 @@ virMacAddrParse(const char* str, virMacAddrPtr addr)
+ 
+         addr->addr[i] = (unsigned char) result;
+ 
+-        if ((i == 5) && (*end_ptr == '\0'))
++        if ((i == 5) && (*end_ptr <= ' '))
+             return 0;
+         if (*end_ptr != ':')
+             break;
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-make-virPCIGetDeviceAddressFromSysfsLink-public.patch b/SOURCES/libvirt-util-make-virPCIGetDeviceAddressFromSysfsLink-public.patch
new file mode 100644
index 0000000..fa60562
--- /dev/null
+++ b/SOURCES/libvirt-util-make-virPCIGetDeviceAddressFromSysfsLink-public.patch
@@ -0,0 +1,75 @@
+From a45f874c1ba14e839aaa57ba54ec3c6487b93c60 Mon Sep 17 00:00:00 2001
+Message-Id: <a45f874c1ba14e839aaa57ba54ec3c6487b93c60@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:25 -0400
+Subject: [PATCH] util: make virPCIGetDeviceAddressFromSysfsLink() public
+
+This function will be useful in virnetdev.c, so promote it from static.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 9a238c16b382f3366bf474a648ff0e4b777b0af8)
+---
+ src/libvirt_private.syms |  1 +
+ src/util/virpci.c        | 10 +++++++++-
+ src/util/virpci.h        |  3 +++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index bee56765e..b9ea1cfe9 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -2123,6 +2123,7 @@ virPCIDeviceSetUsedBy;
+ virPCIDeviceUnbind;
+ virPCIDeviceWaitForCleanup;
+ virPCIEDeviceInfoFree;
++virPCIGetDeviceAddressFromSysfsLink;
+ virPCIGetHeaderType;
+ virPCIGetNetName;
+ virPCIGetPhysicalFunction;
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index f6d1e48c7..7d9c81167 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -2423,7 +2423,7 @@ virPCIDeviceAddressIsEqual(virPCIDeviceAddressPtr bdf1,
+             (bdf1->function == bdf2->function));
+ }
+ 
+-static virPCIDeviceAddressPtr
++virPCIDeviceAddressPtr
+ virPCIGetDeviceAddressFromSysfsLink(const char *device_link)
+ {
+     virPCIDeviceAddressPtr bdf = NULL;
+@@ -2752,6 +2752,14 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,
+ #else
+ static const char *unsupported = N_("not supported on non-linux platforms");
+ 
++virPCIDeviceAddressPtr
++virPCIGetDeviceAddressFromSysfsLink(const char *device_link ATTRIBUTE_UNUSED)
++{
++    virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
++    return -1;
++}
++
++
+ int
+ virPCIGetPhysicalFunction(const char *vf_sysfs_path ATTRIBUTE_UNUSED,
+                           virPCIDeviceAddressPtr *pf ATTRIBUTE_UNUSED)
+diff --git a/src/util/virpci.h b/src/util/virpci.h
+index 5c63eab73..c3cb2d679 100644
+--- a/src/util/virpci.h
++++ b/src/util/virpci.h
+@@ -185,6 +185,9 @@ int virPCIDeviceIsAssignable(virPCIDevicePtr dev,
+                              int strict_acs_check);
+ int virPCIDeviceWaitForCleanup(virPCIDevicePtr dev, const char *matcher);
+ 
++virPCIDeviceAddressPtr
++virPCIGetDeviceAddressFromSysfsLink(const char *device_link);
++
+ int virPCIGetPhysicalFunction(const char *vf_sysfs_path,
+                               virPCIDeviceAddressPtr *pf);
+ 
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-new-function-virNetDevPFGetVF.patch b/SOURCES/libvirt-util-new-function-virNetDevPFGetVF.patch
new file mode 100644
index 0000000..b086e52
--- /dev/null
+++ b/SOURCES/libvirt-util-new-function-virNetDevPFGetVF.patch
@@ -0,0 +1,128 @@
+From 2a8115ab21d5efa526e982ea825b42037fc163eb Mon Sep 17 00:00:00 2001
+Message-Id: <2a8115ab21d5efa526e982ea825b42037fc163eb@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:28 -0400
+Subject: [PATCH] util: new function virNetDevPFGetVF()
+
+Given an SRIOV PF netdev name (e.g. "enp2s0f0") and VF#, this new
+function returns the netdev name of the referenced VF device
+(e.g. "enp2s11f6"), or NULL if the device isn't bound to a net driver.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 554253ad04463e0442030f4630f0a4a02613a595)
+---
+ src/libvirt_private.syms |  1 +
+ src/util/virnetdev.c     | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
+ src/util/virnetdev.h     |  3 +++
+ 3 files changed, 65 insertions(+)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index b9e85449b..f91703f2e 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -1899,6 +1899,7 @@ virNetDevGetVLanID;
+ virNetDevIfStateTypeFromString;
+ virNetDevIfStateTypeToString;
+ virNetDevIsVirtualFunction;
++virNetDevPFGetVF;
+ virNetDevReplaceMacAddress;
+ virNetDevReplaceNetConfig;
+ virNetDevRestoreMacAddress;
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index ffc2fb4e4..807b67697 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1311,6 +1311,57 @@ virNetDevGetPhysicalFunction(const char *ifname, char **pfname)
+     return ret;
+ }
+ 
++
++/**
++ * virNetDevPFGetVF:
++ *
++ * @pfname: netdev name of the physical function (PF)
++ * @vf: virtual function (VF) number for the device of interest
++ * @vfname: name of the physical function interface name
++ *
++ * Finds the netdev name of VF# @vf of SRIOV PF @pfname, and puts it
++ * in @vfname. The caller must free @vfname when it's finished with
++ * it.
++ *
++ * Returns 0 on success, -1 on failure
++ *
++ * NB: if the VF has no netdev name, that is *not* considered an
++ * error; *vfname simply gets a NULL and the return value is 0
++ * (success).
++ */
++int
++virNetDevPFGetVF(const char *pfname, int vf, char **vfname)
++{
++    char *virtfnName = NULL;
++    char *virtfnSysfsPath = NULL;
++    int ret = -1;
++
++    if (virAsprintf(&virtfnName, "virtfn%d", vf) < 0)
++        goto cleanup;
++
++    /* this provides the path to the VF's directory in sysfs,
++     * e.g. "/sys/class/net/enp2s0f0/virtfn3"
++     */
++    if (virNetDevSysfsDeviceFile(&virtfnSysfsPath, pfname, virtfnName) < 0)
++        goto cleanup;
++
++    /* and this gets the netdev name associated with it, which is a
++     * directory entry in [virtfnSysfsPath]/net,
++     * e.g. "/sys/class/net/enp2s0f0/virtfn3/net/enp2s11f4" - in this
++     * example the VF for enp2s0f0 vf#3 is "enp2s11f4". (If the VF
++     * isn't bound to a netdev driver, it won't have a netdev name,
++     * and vfname will be NULL).
++     */
++    ret = virPCIGetNetName(virtfnSysfsPath, vfname);
++
++ cleanup:
++    VIR_FREE(virtfnName);
++    VIR_FREE(virtfnSysfsPath);
++
++    return ret;
++}
++
++
+ /**
+  * virNetDevGetVirtualFunctionInfo:
+  * @vfname: name of the virtual function interface
+@@ -1391,6 +1442,16 @@ virNetDevGetPhysicalFunction(const char *ifname ATTRIBUTE_UNUSED,
+ }
+ 
+ int
++virNetDevPFGetVF(const char *pfname ATTRIBUTE_UNUSED,
++                 int vf ATTRIBUTE_UNUSED,
++                 char **vfname ATTRUBUTE_UNUSED)
++{
++    virReportSystemError(ENOSYS, "%s",
++                         _("Unable to get virtual function name on this platform"));
++    return -1;
++}
++
++int
+ virNetDevGetVirtualFunctionInfo(const char *vfname ATTRIBUTE_UNUSED,
+                                 char **pfname ATTRIBUTE_UNUSED,
+                                 int *vf ATTRIBUTE_UNUSED)
+diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
+index c3e8ffce9..d534a3946 100644
+--- a/src/util/virnetdev.h
++++ b/src/util/virnetdev.h
+@@ -176,6 +176,9 @@ int virNetDevGetVirtualFunctionIndex(const char *pfname, const char *vfname,
+ int virNetDevGetPhysicalFunction(const char *ifname, char **pfname)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+ 
++int virNetDevPFGetVF(const char *pfname, int vf, char **vfname)
++    ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
++
+ int virNetDevGetVirtualFunctions(const char *pfname,
+                                  char ***vfname,
+                                  virPCIDeviceAddressPtr **virt_fns,
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-new-function-virPCIDeviceRebind.patch b/SOURCES/libvirt-util-new-function-virPCIDeviceRebind.patch
new file mode 100644
index 0000000..dc05a8b
--- /dev/null
+++ b/SOURCES/libvirt-util-new-function-virPCIDeviceRebind.patch
@@ -0,0 +1,88 @@
+From c15fbdd1e0b82b8ce257685896d0b16358ee45f8 Mon Sep 17 00:00:00 2001
+Message-Id: <c15fbdd1e0b82b8ce257685896d0b16358ee45f8@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:26 -0400
+Subject: [PATCH] util: new function virPCIDeviceRebind()
+
+This function unbinds a device from its driver, then immediately
+rebinds it to its driver again. The code for this new function is just
+the 2nd half of virPCIDeviceBindWithDriverOverride(), so that
+function's 2nd half is replaced with a call to virPCIDeviceRebind().
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 251d179bf2c10c7d7fb594c68f1aac56a9b0d932)
+
+Conflicts:
+ src/util/virpci.c - virPCIDeviceBindWithDriverOverride()
+   which calls the new function, doesn't exist yet on this branch.
+---
+ src/libvirt_private.syms |  1 +
+ src/util/virpci.c        | 25 +++++++++++++++++++++++++
+ src/util/virpci.h        |  1 +
+ 3 files changed, 27 insertions(+)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index b9ea1cfe9..b9e85449b 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -2113,6 +2113,7 @@ virPCIDeviceListSteal;
+ virPCIDeviceListStealIndex;
+ virPCIDeviceNew;
+ virPCIDeviceReattach;
++virPCIDeviceRebind;
+ virPCIDeviceReset;
+ virPCIDeviceSetManaged;
+ virPCIDeviceSetRemoveSlot;
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index 7d9c81167..de90a82c2 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -1089,6 +1089,31 @@ virPCIDeviceUnbind(virPCIDevicePtr dev)
+     return ret;
+ }
+ 
++
++/**
++ * virPCIDeviceRebind:
++ *  @dev: virPCIDevice object describing the device to rebind
++ *
++ * unbind a device from its driver, then immediately rebind it.
++ *
++ * Returns 0 on success, -1 on failure
++ */
++int virPCIDeviceRebind(virPCIDevicePtr dev)
++{
++    if (virPCIDeviceUnbind(dev) < 0)
++        return -1;
++
++    if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name, 0) < 0) {
++        virReportSystemError(errno,
++                             _("Failed to trigger a probe for PCI device '%s'"),
++                             dev->name);
++        return -1;
++    }
++
++    return 0;
++}
++
++
+ static int
+ virPCIDeviceUnbindFromStub(virPCIDevicePtr dev)
+ {
+diff --git a/src/util/virpci.h b/src/util/virpci.h
+index c3cb2d679..afd85502c 100644
+--- a/src/util/virpci.h
++++ b/src/util/virpci.h
+@@ -224,6 +224,7 @@ int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,
+                                  char **pfname, int *vf_index);
+ 
+ int virPCIDeviceUnbind(virPCIDevicePtr dev);
++int virPCIDeviceRebind(virPCIDevicePtr dev);
+ int virPCIDeviceGetDriverPathAndName(virPCIDevicePtr dev,
+                                      char **path,
+                                      char **name);
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-new-functions-virNetDev-Save-Read-Set-NetConfig.patch b/SOURCES/libvirt-util-new-functions-virNetDev-Save-Read-Set-NetConfig.patch
new file mode 100644
index 0000000..b166194
--- /dev/null
+++ b/SOURCES/libvirt-util-new-functions-virNetDev-Save-Read-Set-NetConfig.patch
@@ -0,0 +1,707 @@
+From 1a69b4e4b8f0eed78951464a8916356961203687 Mon Sep 17 00:00:00 2001
+Message-Id: <1a69b4e4b8f0eed78951464a8916356961203687@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:29 -0400
+Subject: [PATCH] util: new functions virNetDev(Save|Read|Set)NetConfig()
+
+These three functions are destined to replace
+virNetDev(Replace|Restore)NetConfig() and
+virNetDev(Replace|Restore)MacAddress(), which both do the save and set
+together as a single step. We need to separate the save, read, and set
+steps because there will be situations where we need to do something
+else in between (in particular, we will need to rebind a VF's driver
+after save but before set).
+
+This patch creates the new functions, but doesn't call them - that
+will come in a subsequent patch. Note that the new functions to
+read/write the file that stores the original network config now uses
+JSON rather than plaintext (it still recognizes the old format as well
+though, so it won't get confused during an upgrade).
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 26694daf0997290e4a02fd10b1c2e24678ca8653)
+---
+ src/libvirt_private.syms |   3 +
+ src/util/virnetdev.c     | 590 ++++++++++++++++++++++++++++++++++++++++++++++-
+ src/util/virnetdev.h     |  22 ++
+ 3 files changed, 613 insertions(+), 2 deletions(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index f91703f2e..9b0bc0100 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -1900,6 +1900,7 @@ virNetDevIfStateTypeFromString;
+ virNetDevIfStateTypeToString;
+ virNetDevIsVirtualFunction;
+ virNetDevPFGetVF;
++virNetDevReadNetConfig;
+ virNetDevReplaceMacAddress;
+ virNetDevReplaceNetConfig;
+ virNetDevRestoreMacAddress;
+@@ -1909,11 +1910,13 @@ virNetDevRxFilterFree;
+ virNetDevRxFilterModeTypeFromString;
+ virNetDevRxFilterModeTypeToString;
+ virNetDevRxFilterNew;
++virNetDevSaveNetConfig;
+ virNetDevSetMAC;
+ virNetDevSetMTU;
+ virNetDevSetMTUFromDevice;
+ virNetDevSetName;
+ virNetDevSetNamespace;
++virNetDevSetNetConfig;
+ virNetDevSetOnline;
+ virNetDevSetPromiscuous;
+ virNetDevSetRcvAllMulti;
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index 807b67697..b61ed0f0b 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -33,6 +33,7 @@
+ #include "virlog.h"
+ #include "virstring.h"
+ #include "virutil.h"
++#include "virjson.h"
+ 
+ #include <sys/ioctl.h>
+ #include <net/if.h>
+@@ -1902,7 +1903,551 @@ virNetDevRestoreNetConfig(const char *linkdev, int vf, const char *stateDir)
+     return ret;
+ }
+ 
+-#else /* defined(__linux__) && defined(HAVE_LIBNL) */
++# define VIR_NETDEV_KEYNAME_ADMIN_MAC "adminMac"
++# define VIR_NETDEV_KEYNAME_VLAN_TAG "vlanTag"
++# define VIR_NETDEV_KEYNAME_MAC "mac"
++
++/**
++ * virNetDevSaveNetConfig:
++ * @linkdev: name of the interface
++ * @vf: vf index if linkdev is a pf
++ * @stateDir: directory to store old net config
++ * @saveVlan: false if we shouldn't attempt to save vlan tag info
++ *            (eg for interfaces using 802.1Qbg, since it handles
++ *            vlan tags internally)
++ *
++ * Save current MAC address and (if linkdev itself is a VF, or if @vf
++ * >= 0) the "admin MAC address" and vlan tag the device described by
++ * @linkdev:@vf to @stateDir. (the "admin MAC address" is stored in
++ * the PF, and is what the VF MAC will be initialized to the next time
++ * its driver is reloaded (either on host or guest).
++ *
++ * File Format:
++ *
++ * The file is in json format and will contain 1 or more of the
++ * following values:
++ *
++ *      "mac"      - VF MAC address (or missing if VF has no host net driver)
++ *      "vlanTag"  - a single vlan tag id
++ *      "adminMac" - admin MAC address (stored in the PF)
++ *
++ * For example:
++ *
++ *    {"mac": "9A:11:22:33:44:55",
++ *     "vlanTag": "42",
++ *     "adminMac": "00:00:00:00:00:00"
++ *    }
++ *
++ * File Name:
++ *
++ * If the device is a VF and we're allowed to save vlan tag info, the
++ * file will be named ${pfDevName_vf#{vf} (e.g. "enp2s0f0_vf5") and
++ * will contain at least "adminMac" and "vlanTag" (if the device was bound
++ * to a net driver on the host prior to use, it will also have "mac"..
++ * If the device isn't a VF, or we're not allowed to save vlan tag
++ * info, the file will be named ${linkdev} (e.g. "enp3s0f0") and will
++ * contain just linkdev's MAC address.
++ *
++ * Returns 0 on success, -1 on failure
++ *
++ */
++int
++virNetDevSaveNetConfig(const char *linkdev, int vf,
++                       const char *stateDir,
++                       bool saveVlan)
++{
++    int ret = -1;
++    const char *pfDevName = NULL;
++    char *pfDevOrig = NULL;
++    char *vfDevOrig = NULL;
++    virMacAddr oldMAC;
++    char MACStr[VIR_MAC_STRING_BUFLEN];
++    int oldVlanTag = -1;
++    char *filePath = NULL;
++    char *fileStr = NULL;
++    virJSONValuePtr configJSON = NULL;
++
++    if (vf >= 0) {
++        /* linkdev is the PF */
++        pfDevName = linkdev;
++
++        /* linkdev should get the VF's netdev name (or NULL if none) */
++        if (virNetDevPFGetVF(pfDevName, vf, &vfDevOrig) < 0)
++            goto cleanup;
++
++        linkdev = vfDevOrig;
++
++    } else if (saveVlan && virNetDevIsVirtualFunction(linkdev) == 1) {
++        /* when vf is -1, linkdev might be a standard netdevice (not
++         * SRIOV), or it might be an SRIOV VF. If it's a VF, normalize
++         * it to PF + VFname
++         */
++
++        if (virNetDevGetPhysicalFunction(linkdev, &pfDevOrig) < 0)
++            goto cleanup;
++
++        pfDevName = pfDevOrig;
++
++        if (virNetDevGetVirtualFunctionIndex(pfDevName, linkdev, &vf) < 0)
++            goto cleanup;
++    }
++
++    if (!(configJSON = virJSONValueNewObject()))
++        goto cleanup;
++
++    /* if there is a PF, it's now in pfDevName, and linkdev is either
++     * the VF's name, or NULL (if the VF isn't bound to a net driver
++     * on the host)
++     */
++
++    if (pfDevName) {
++        if (virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf) < 0)
++            goto cleanup;
++
++        /* get admin MAC and vlan tag */
++        if (virNetDevGetVfConfig(pfDevName, vf, &oldMAC,
++                                 saveVlan ? &oldVlanTag : NULL) < 0) {
++            goto cleanup;
++        }
++
++        if (virJSONValueObjectAppendString(configJSON,
++                                           VIR_NETDEV_KEYNAME_ADMIN_MAC,
++                                           virMacAddrFormat(&oldMAC, MACStr)) < 0 ||
++            virJSONValueObjectAppendNumberInt(configJSON,
++                                              VIR_NETDEV_KEYNAME_VLAN_TAG,
++                                              oldVlanTag) < 0) {
++            goto cleanup;
++        }
++
++    } else {
++        if (virAsprintf(&filePath, "%s/%s", stateDir, linkdev) < 0)
++            goto cleanup;
++    }
++
++    if (linkdev) {
++        if (virNetDevGetMAC(linkdev, &oldMAC) < 0)
++            goto cleanup;
++
++        /* for interfaces with no pfDevName (i.e. not a VF, this will
++         * be the only value in the file.
++         */
++        if (virJSONValueObjectAppendString(configJSON, VIR_NETDEV_KEYNAME_MAC,
++                                           virMacAddrFormat(&oldMAC, MACStr)) < 0)
++           goto cleanup;
++    }
++
++    if (!(fileStr = virJSONValueToString(configJSON, true)))
++        goto cleanup;
++
++    if (virFileWriteStr(filePath, fileStr, O_CREAT|O_TRUNC|O_WRONLY) < 0) {
++        virReportSystemError(errno, _("Unable to preserve mac/vlan tag "
++                                      "for device = %s, vf = %d"), linkdev, vf);
++        goto cleanup;
++    }
++
++    ret = 0;
++ cleanup:
++    VIR_FREE(pfDevOrig);
++    VIR_FREE(vfDevOrig);
++    VIR_FREE(filePath);
++    VIR_FREE(fileStr);
++    virJSONValueFree(configJSON);
++    return ret;
++}
++
++
++/**
++ * virNetDevReadNetConfig:
++ * @linkdev: name of the interface
++ * @vf: vf index if linkdev is a pf
++ * @stateDir: directory where net config is stored
++ * @adminMAC: returns admin MAC to store in the PF (if this is a VF)
++ * @MAC: returns MAC to set on device immediately
++ *
++ * Read saved MAC address and (if linkdev itself is a VF, or if @vf >=
++ * 0) "admin MAC address" and vlan tag of the device described by
++ * @linkdev:@vf from a file in @stateDir. (see virNetDevSaveNetConfig
++ * for details of file name and format).
++ *
++ * Returns 0 on success, -1 on failure.
++ *
++ * The caller MUST free adminMAC, vlan, and MAC when it is finished
++ * with them (they will be NULL if they weren't found in the file)
++ *
++ */
++int
++virNetDevReadNetConfig(const char *linkdev, int vf,
++                       const char *stateDir,
++                       virMacAddrPtr *adminMAC,
++                       virNetDevVlanPtr *vlan,
++                       virMacAddrPtr *MAC)
++{
++    int ret = -1;
++    const char *pfDevName = NULL;
++    char *pfDevOrig = NULL;
++    char *vfDevOrig = NULL;
++    char *filePath = NULL;
++    char *fileStr = NULL;
++    virJSONValuePtr configJSON = NULL;
++    const char *MACStr = NULL;
++    const char *adminMACStr = NULL;
++    int vlanTag = -1;
++
++    *adminMAC = NULL;
++    *vlan = NULL;
++    *MAC = NULL;
++
++    if (vf >= 0) {
++        /* linkdev is the PF */
++        pfDevName = linkdev;
++
++        /* linkdev should get the VF's netdev name (or NULL if none) */
++        if (virNetDevPFGetVF(pfDevName, vf, &vfDevOrig) < 0)
++            goto cleanup;
++
++        linkdev = vfDevOrig;
++
++    } else if (virNetDevIsVirtualFunction(linkdev) == 1) {
++        /* when vf is -1, linkdev might be a standard netdevice (not
++         * SRIOV), or it might be an SRIOV VF. If it's a VF, normalize
++         * it to PF + VFname
++         */
++
++        if (virNetDevGetPhysicalFunction(linkdev, &pfDevOrig) < 0)
++            goto cleanup;
++
++        pfDevName = pfDevOrig;
++
++        if (virNetDevGetVirtualFunctionIndex(pfDevName, linkdev, &vf) < 0)
++            goto cleanup;
++    }
++
++    /* if there is a PF, it's now in pfDevName, and linkdev is either
++     * the VF's name, or NULL (if the VF isn't bound to a net driver
++     * on the host)
++     */
++
++    if (pfDevName) {
++        if (virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf) < 0)
++            goto cleanup;
++
++        if (linkdev && !virFileExists(filePath)) {
++            /* the device may have been stored in a file named for the
++             * VF due to saveVlan == false (or an older version of
++             * libvirt), so reset filePath so we'll try the other
++             * filename before failing.
++             */
++            VIR_FREE(filePath);
++            pfDevName = NULL;
++        }
++    }
++
++    if (!pfDevName) {
++        if (virAsprintf(&filePath, "%s/%s", stateDir, linkdev) < 0)
++            goto cleanup;
++    }
++
++    if (virFileReadAll(filePath, 128, &fileStr) < 0)
++        goto cleanup;
++
++    if (strchr("0123456789abcdefABCDEF", fileStr[0])) {
++        const char *vlanStr = NULL;
++
++        /* old version of file - just two lines of text. Line 1 is the
++         * MAC address (or if line 2 is present, line 1 is adminMAC),
++         * and line 2 (if present) is the vlan tag
++         */
++
++        if ((vlanStr = strchr(fileStr, '\n'))) {
++            char *endptr;
++
++            /* if there are 2 lines, the first is adminMAC */
++            adminMACStr = fileStr;
++            vlanStr++;
++
++            if ((virStrToLong_i(vlanStr, &endptr, 10, &vlanTag) < 0) ||
++                (endptr && *endptr != '\n' && *endptr != 0)) {
++                virReportError(VIR_ERR_INTERNAL_ERROR,
++                               _("cannot parse vlan tag '%s' from file '%s'"),
++                               vlanStr, filePath);
++                goto cleanup;
++            }
++        } else {
++            /* if there is only one line, it is MAC */
++            MACStr = fileStr;
++        }
++    } else {
++        /* if it doesn't start with a hex digit, it is a modern
++         * version of the config file - JSON format as described in
++         * preamble to virNetDevSaveNetConfig()
++         */
++        if (!(configJSON = virJSONValueFromString(fileStr))) {
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("invalid json in net device saved "
++                             "config file '%s': '%.60s'"),
++                           filePath, fileStr);
++            goto cleanup;
++        }
++
++        MACStr = virJSONValueObjectGetString(configJSON,
++                                             VIR_NETDEV_KEYNAME_MAC);
++        adminMACStr = virJSONValueObjectGetString(configJSON,
++                                                  VIR_NETDEV_KEYNAME_ADMIN_MAC);
++        ignore_value(virJSONValueObjectGetNumberInt(configJSON,
++                                                    VIR_NETDEV_KEYNAME_VLAN_TAG,
++                                                    &vlanTag));
++
++        if (!(MACStr || adminMACStr)) {
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("network device saved config file '%s' "
++                             "has unexpected contents, missing both "
++                             "'MAC' and 'adminMAC': '%.60s'"),
++                           filePath, fileStr);
++            goto cleanup;
++        }
++    }
++
++    if (MACStr) {
++        if (VIR_ALLOC(*MAC) < 0)
++            goto cleanup;
++
++        if (virMacAddrParse(MACStr, *MAC) < 0) {
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("cannot parse MAC address '%s' from file '%s'"),
++                           MACStr, filePath);
++            goto cleanup;
++        }
++    }
++
++    if (adminMACStr) {
++        if (VIR_ALLOC(*adminMAC) < 0)
++            goto cleanup;
++
++        if (virMacAddrParse(adminMACStr, *adminMAC) < 0) {
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("cannot parse MAC address '%s' from file '%s'"),
++                           adminMACStr, filePath);
++            goto cleanup;
++        }
++    }
++
++    if (vlanTag != -1) {
++        /* construct a simple virNetDevVlan object with a single tag */
++        if (VIR_ALLOC(*vlan) < 0)
++            goto cleanup;
++        if (VIR_ALLOC((*vlan)->tag) < 0)
++            goto cleanup;
++        (*vlan)->nTags = 1;
++        (*vlan)->tag[0] = vlanTag;
++    }
++
++    /* we won't need the file again */
++    ignore_value(unlink(filePath));
++
++    ret = 0;
++ cleanup:
++    if (ret < 0) {
++        VIR_FREE(*adminMAC);
++        VIR_FREE(*MAC);
++        VIR_FREE(*vlan);
++    }
++
++    VIR_FREE(pfDevOrig);
++    VIR_FREE(vfDevOrig);
++    VIR_FREE(filePath);
++    VIR_FREE(fileStr);
++    virJSONValueFree(configJSON);
++    return ret;
++}
++
++
++/**
++ * virNetDevSetNetConfig:
++ * @linkdev: name of the interface
++ * @vf: vf index if linkdev is a PF
++ * @adminMAC: new admin MAC address (will be stored in PF and
++ *            used for next initialization of VF driver)
++ * @vlan: new vlan tag info (or NULL)
++ * @MAC: new MAC address to set on the device immediately
++ * @setVlan: true to enable setting vlan tag (even if @vlan is NULL,
++ *           the interface vlan tag will be set to 0).
++ *
++ *
++ * Set new MAC address and (optionally) admin MAC and vlan tag of
++ * @linkdev VF# @vf.
++ *
++ * Returns 0 on success, -1 on failure
++ *
++ */
++int
++virNetDevSetNetConfig(const char *linkdev, int vf,
++                      const virMacAddr *adminMAC,
++                      virNetDevVlanPtr vlan,
++                      const virMacAddr *MAC,
++                      bool setVlan)
++{
++    int ret = -1;
++    char MACStr[VIR_MAC_STRING_BUFLEN];
++    const char *pfDevName = NULL;
++    char *pfDevOrig = NULL;
++    char *vfDevOrig = NULL;
++    int vlanTag = -1;
++
++    if (vf >= 0) {
++        /* linkdev is the PF */
++        pfDevName = linkdev;
++
++        /* linkdev should get the VF's netdev name (or NULL if none) */
++        if (virNetDevPFGetVF(pfDevName, vf, &vfDevOrig) < 0)
++            goto cleanup;
++
++        linkdev = vfDevOrig;
++
++    } else if (virNetDevIsVirtualFunction(linkdev) == 1) {
++        /* when vf is -1, linkdev might be a standard netdevice (not
++         * SRIOV), or it might be an SRIOV VF. If it's a VF, normalize
++         * it to PF + VFname
++         */
++
++        if (virNetDevGetPhysicalFunction(linkdev, &pfDevOrig) < 0)
++            goto cleanup;
++
++        pfDevName = pfDevOrig;
++
++        if (virNetDevGetVirtualFunctionIndex(pfDevName, linkdev, &vf) < 0)
++            goto cleanup;
++    }
++
++
++    if (!pfDevName) {
++        /* if it's not SRIOV, then we can't set the admin MAC address
++         * or vlan tag
++         */
++        if (adminMAC) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("admin MAC can only be set for SR-IOV VFs, but "
++                             "%s is not a VF"), linkdev);
++            goto cleanup;
++        }
++
++        if (vlan) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("vlan can only be set for SR-IOV VFs, but "
++                             "%s is not a VF"), linkdev);
++            goto cleanup;
++        }
++
++    } else {
++        bool pfIsOnline;
++
++        /* Assure that PF is online before trying to use it to set
++         * anything up for this VF. It *should* be online already,
++         * but if it isn't online the changes made to the VF via the
++         * PF won't take effect, yet there will be no error
++         * reported. In the case that the PF isn't online, we need to
++         * fail and report the error, rather than automatically
++         * setting it online, since setting an unconfigured interface
++         * online automatically turns on IPv6 autoconfig, which may
++         * not be what the admin expects, so we require them to
++         * explicitly enable the PF in the host system network config.
++         */
++        if (virNetDevGetOnline(pfDevName, &pfIsOnline) < 0)
++            goto cleanup;
++
++        if (!pfIsOnline) {
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("Unable to configure VF %d of PF '%s' "
++                             "because the PF is not online. Please "
++                             "change host network config to put the "
++                             "PF online."),
++                           vf, pfDevName);
++            goto cleanup;
++        }
++
++        if (vlan) {
++            if (vlan->nTags != 1 || vlan->trunk) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                               _("vlan trunking is not supported "
++                                 "by SR-IOV network devices"));
++                goto cleanup;
++            }
++
++            if (!setVlan) {
++                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
++                               _("vlan tag set for interface %s but "
++                                 "caller requested it not be set"));
++                goto cleanup;
++            }
++
++            vlanTag = vlan->tag[0];
++
++        } else if (setVlan) {
++            vlanTag = 0; /* assure any existing vlan tag is reset */
++        }
++    }
++
++    if (MAC) {
++        if (!linkdev) {
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("VF %d of PF '%s' is not bound to a net driver, "
++                             "so its MAC address cannot be set to %s"),
++                           vf, pfDevName, virMacAddrFormat(MAC, MACStr));
++            goto cleanup;
++        }
++
++        if (virNetDevSetMAC(linkdev, MAC) < 0) {
++            /* This may have failed due to the "administratively
++             * set" flag being set in the PF for this VF. For now
++             * we will just fail, but in the future we should
++             * attempt to set the VF MAC via the PF.
++             */
++            goto cleanup;
++        }
++        if (pfDevOrig) {
++            /* if pfDevOrig is set, it means that the caller was
++             * *really* only interested in setting the MAC of the VF
++             * itself, *not* the admin MAC via the PF. In those cases,
++             * the adminMAC was only provided in case we need to set
++             * the VF's MAC by temporarily unbinding/rebinding the
++             * VF's net driver with the admin MAC set to the desired
++             * MAC, and then want to restore the admin MAC to its
++             * original setting when we're finished. We would only
++             * need to do that if the virNetDevSetMAC() above had
++             * failed; since it didn't, we don't need to set the
++             * adminMAC, so we are NULLing it out here to avoid that
++             * below.
++
++             * (NB: since setting the admin MAC sets the
++             * "administratively set" flag for the VF in the PF's
++             * driver, which prevents any future changes to the VF's
++             * MAC address, we want to avoid setting the admin MAC as
++             * much as possible.)
++             */
++            adminMAC = NULL;
++        }
++    }
++
++    if (adminMAC || vlanTag >= 0) {
++        /* Set vlanTag and admin MAC using an RTM_SETLINK request sent to
++         * PFdevname+VF#, if mac != NULL this will set the "admin MAC" via
++         * the PF, *not* the actual VF MAC - the admin MAC only takes
++         * effect the next time the VF's driver is initialized (either in
++         * guest or host). if there is a vlanTag to set, it will take
++         * effect immediately though.
++         */
++        if (virNetDevSetVfConfig(pfDevName, vf, adminMAC, vlanTag) < 0)
++            goto cleanup;
++    }
++
++    ret = 0;
++ cleanup:
++    VIR_FREE(pfDevOrig);
++    VIR_FREE(vfDevOrig);
++    return ret;
++}
++
++
++#else /* defined(__linux__) && defined(HAVE_LIBNL)  && defined(IFLA_VF_MAX) */
+ 
+ int
+ virNetDevReplaceNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
+@@ -1927,7 +2472,48 @@ virNetDevRestoreNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
+     return -1;
+ }
+ 
+-#endif /* defined(__linux__) && defined(HAVE_LIBNL) */
++
++int
++virNetDevSaveNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
++                       int vf ATTRIBUTE_UNUSED,
++                       const char *stateDir ATTRIBUTE_UNUSED,
++                       bool saveVlan ATTRIBUTE_UNUSED)
++{
++    virReportSystemError(ENOSYS, "%s",
++                         _("Unable to save net device config on this platform"));
++    return -1;
++}
++
++
++int
++virNetDevReadNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
++                       int vf ATTRIBUTE_UNUSED,
++                       const char *stateDir ATTRIBUTE_UNUSED,
++                       virMacAddrPtr *adminMAC ATTRIBUTE_UNUSED,
++                       virNetDevVLanPtr *vlan ATTRIBUTE_UNUSED,
++                       virMacAddrPtr *MAC ATTRIBUTE_UNUSED)
++{
++    virReportSystemError(ENOSYS, "%s",
++                         _("Unable to read net device config on this platform"));
++    return -1;
++}
++
++
++int
++virNetDevSetNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
++                      int vf ATTRIBUTE_UNUSED,
++                      const virMacAddr *adminMAC ATTRIBUTE_UNUSED,
++                      virNetDevVlanPtr vlan ATTRIBUTE_UNUSED,
++                      const virMacAddr *MAC ATTRIBUTE_UNUSED,
++                      bool setVlan ATTRIBUTE_UNUSED)
++{
++    virReportSystemError(ENOSYS, "%s",
++                         _("Unable to set net device config on this platform"));
++    return -1;
++}
++
++
++#endif /* defined(__linux__) && defined(HAVE_LIBNL) && defined(IFLA_VF_MAX) */
+ 
+ VIR_ENUM_IMPL(virNetDevIfState,
+               VIR_NETDEV_IF_STATE_LAST,
+diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
+index d534a3946..b5abf7a7b 100644
+--- a/src/util/virnetdev.h
++++ b/src/util/virnetdev.h
+@@ -187,6 +187,28 @@ int virNetDevGetVirtualFunctions(const char *pfname,
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
+     ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK;
+ 
++int virNetDevSaveNetConfig(const char *linkdev, int vf,
++                           const char *stateDir,
++                           bool saveVlan)
++    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK;
++
++int
++virNetDevReadNetConfig(const char *linkdev, int vf,
++                       const char *stateDir,
++                       virMacAddrPtr *adminMAC,
++                       virNetDevVlanPtr *vlan,
++                       virMacAddrPtr *MAC)
++   ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
++   ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK;
++
++int
++virNetDevSetNetConfig(const char *linkdev, int vf,
++                      const virMacAddr *adminMAC,
++                      virNetDevVlanPtr vlan,
++                      const virMacAddr *MAC,
++                      bool setVLan)
++    ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
++
+ int virNetDevReplaceNetConfig(const char *linkdev, int vf,
+                               const virMacAddr *macaddress,
+                               virNetDevVlanPtr vlan,
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-new-internal-function-to-permit-silent-failure-of-virNetDevSetMAC.patch b/SOURCES/libvirt-util-new-internal-function-to-permit-silent-failure-of-virNetDevSetMAC.patch
new file mode 100644
index 0000000..4beb7be
--- /dev/null
+++ b/SOURCES/libvirt-util-new-internal-function-to-permit-silent-failure-of-virNetDevSetMAC.patch
@@ -0,0 +1,140 @@
+From 4ebaf75b8d1650d1067483b16ad243cb204ba8dc Mon Sep 17 00:00:00 2001
+Message-Id: <4ebaf75b8d1650d1067483b16ad243cb204ba8dc@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:27 -0400
+Subject: [PATCH] util: new internal function to permit silent failure of
+ virNetDevSetMAC()
+
+We will want to allow silent failure of virNetDevSetMAC() in the case
+that the SIOSIFHWADDR ioctl fails with errno == EADDRNOTAVAIL. (Yes,
+that is very specific, but we really *do* want a logged failure in all
+other circumstances, and don't want to duplicate code in the caller
+for the other possibilities).
+
+This patch renames the 3 different virNetDevSetMAC() functions to
+virNetDevSetMACInternal(), adding a 3rd arg called "quiet" and making
+them static (because this extra control will only be needed within
+virnetdev.c). A new global virNetDevSetMAC() is defined that calls
+whichever of the three *Internal() functions gets compiled with quiet
+= false. Callers in virnetdev.c that want to notice a failure with
+errno == EADDRNOTAVAIL and retry with a different strategy rather than
+immediately failing, can call virNetDevSetMACInternal(..., true).
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit f4ef3a71f8abc83771952604d309b39ca3ea64cf)
+---
+ src/util/virnetdev.c | 51 +++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 41 insertions(+), 10 deletions(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index 766638dd3..ffc2fb4e4 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -222,17 +222,20 @@ int virNetDevExists(const char *ifname)
+ #if defined(SIOCGIFHWADDR) && defined(SIOCSIFHWADDR) && \
+     defined(HAVE_STRUCT_IFREQ)
+ /**
+- * virNetDevSetMAC:
++ * virNetDevSetMACInternal:
+  * @ifname: interface name to set MTU for
+  * @macaddr: MAC address
++ * @quiet: true if a failure to set MAC address with errno == EADDRNOTAVAIL
++ *         should be silent (still returns error, but without log)
+  *
+- * This function sets the @macaddr for a given interface @ifname. This
+- * gets rid of the kernel's automatically assigned random MAC.
++ * This function sets the @macaddr for a given interface @ifname.
+  *
+  * Returns 0 in case of success or -1 on failure
+  */
+-int virNetDevSetMAC(const char *ifname,
+-                    const virMacAddr *macaddr)
++static int
++virNetDevSetMACInternal(const char *ifname,
++                        const virMacAddr *macaddr,
++                        bool quiet)
+ {
+     int fd = -1;
+     int ret = -1;
+@@ -254,6 +257,9 @@ int virNetDevSetMAC(const char *ifname,
+     if (ioctl(fd, SIOCSIFHWADDR, &ifr) < 0) {
+         char macstr[VIR_MAC_STRING_BUFLEN];
+ 
++        if (quiet && errno == EADDRNOTAVAIL)
++            goto cleanup;
++
+         virReportSystemError(errno,
+                              _("Cannot set interface MAC to %s on '%s'"),
+                              virMacAddrFormat(macaddr, macstr), ifname);
+@@ -266,10 +272,16 @@ int virNetDevSetMAC(const char *ifname,
+     VIR_FORCE_CLOSE(fd);
+     return ret;
+ }
+-#elif defined(SIOCSIFLLADDR) && defined(HAVE_STRUCT_IFREQ) && \
++
++
++#elif defined(SIOCSIFLLADDR) && defined(HAVE_STRUCT_IFREQ) &&   \
+     HAVE_DECL_LINK_ADDR
+-int virNetDevSetMAC(const char *ifname,
+-                    const virMacAddr *macaddr)
++
++
++static int
++virNetDevSetMACInternal(const char *ifname,
++                        const virMacAddr *macaddr,
++                        bool quiet)
+ {
+         struct ifreq ifr;
+         struct sockaddr_dl sdl;
+@@ -288,6 +300,9 @@ int virNetDevSetMAC(const char *ifname,
+         ifr.ifr_addr.sa_len = VIR_MAC_BUFLEN;
+ 
+         if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) {
++            if (quiet && errno == EADDRNOTAVAIL)
++                goto cleanup;
++
+             virReportSystemError(errno,
+                                  _("Cannot set interface MAC to %s on '%s'"),
+                                  mac + 1, ifname);
+@@ -300,18 +315,34 @@ int virNetDevSetMAC(const char *ifname,
+ 
+         return ret;
+ }
++
++
+ #else
+-int virNetDevSetMAC(const char *ifname,
+-                    const virMacAddr *macaddr ATTRIBUTE_UNUSED)
++
++
++static int
++virNetDevSetMACInternal(const char *ifname,
++                        const virMacAddr *macaddr ATTRIBUTE_UNUSED,
++                        bool quiet ATTRIBUTE_UNUSED)
+ {
+     virReportSystemError(ENOSYS,
+                          _("Cannot set interface MAC on '%s'"),
+                          ifname);
+     return -1;
+ }
++
++
+ #endif
+ 
+ 
++int
++virNetDevSetMAC(const char *ifname,
++                const virMacAddr *macaddr)
++{
++    return virNetDevSetMACInternal(ifname, macaddr, false);
++}
++
++
+ #if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ)
+ /**
+  * virNetDevGetMAC:
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-permit-querying-a-VF-MAC-address-or-VLAN-tag-by-itself.patch b/SOURCES/libvirt-util-permit-querying-a-VF-MAC-address-or-VLAN-tag-by-itself.patch
new file mode 100644
index 0000000..a28dfaf
--- /dev/null
+++ b/SOURCES/libvirt-util-permit-querying-a-VF-MAC-address-or-VLAN-tag-by-itself.patch
@@ -0,0 +1,44 @@
+From 72b55405a6f80807beee4dde71a4c25deb666ba8 Mon Sep 17 00:00:00 2001
+Message-Id: <72b55405a6f80807beee4dde71a4c25deb666ba8@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:19 -0400
+Subject: [PATCH] util: permit querying a VF MAC address or VLAN tag by itself
+
+virNetDevParseVfConfig() assumed that both the MAC address and VLAN
+tag pointers were valid, so even if you only wanted one or the other,
+you would need a variable to hold the returned value for both. This
+patch checks each for a NULL pointer before filling it in.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 176229dd05a6c96dec2b7b1c2fb0143d7331b10e)
+---
+ src/util/virnetdev.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index d12324878..75f969ded 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1534,7 +1534,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac,
+             goto cleanup;
+         }
+ 
+-        if (tb[IFLA_VF_MAC]) {
++        if (mac && tb[IFLA_VF_MAC]) {
+             vf_mac = RTA_DATA(tb_vf[IFLA_VF_MAC]);
+             if (vf_mac && vf_mac->vf == vf)  {
+                 virMacAddrSetRaw(mac, vf_mac->mac);
+@@ -1542,7 +1542,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac,
+             }
+         }
+ 
+-        if (tb[IFLA_VF_VLAN]) {
++        if (vlanid && tb[IFLA_VF_VLAN]) {
+             vf_vlan = RTA_DATA(tb_vf[IFLA_VF_VLAN]);
+             if (vf_vlan && vf_vlan->vf == vf)  {
+                 *vlanid = vf_vlan->vlan;
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-remove-unused-args-from-virNetDevSetVfConfig.patch b/SOURCES/libvirt-util-remove-unused-args-from-virNetDevSetVfConfig.patch
new file mode 100644
index 0000000..37f1f02
--- /dev/null
+++ b/SOURCES/libvirt-util-remove-unused-args-from-virNetDevSetVfConfig.patch
@@ -0,0 +1,137 @@
+From 1a50c04ec7f5f1b1eeffd22543eaba1169910407 Mon Sep 17 00:00:00 2001
+Message-Id: <1a50c04ec7f5f1b1eeffd22543eaba1169910407@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:20 -0400
+Subject: [PATCH] util: remove unused args from virNetDevSetVfConfig()
+
+This function is only called in two places, and the ifindex,
+nltarget_kernel, and getPidFunc args are never used (and never will
+be).
+
+ifindex - we always know the name of the device, and never know the
+ifindex - if we really did need the ifindex we would have to get it
+from the name using virNetDevGetIndex(). In practice, we just send -1
+to virNetDevSetVfConfig(), which doesn't bother to learn the real
+ifindex (you only need a name *or* an ifindex for the netlink command
+to succeed, not both).
+
+nltarget_kernel - messages to set the config of an SRIOV VF will
+always go to netlink in the kernel, not to another user process, so
+this arg is always true (there are other uses of netlink messages
+where the message might need to go to another user process, but never
+in the case of RTM_SETLINK for SRIOV).
+
+getPidFunc - this arg is only used if nltarget_kernel is false, and it
+never is.
+
+None of this has any functional effect, it just makes it easier to
+follow what's happening when virNetDevSetVfConfig() is called.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 0a583c26f766d973c08d05ddf0b8fb297eb10f4f)
+---
+ src/util/virnetdev.c | 30 ++++++++----------------------
+ 1 file changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index 75f969ded..30a4a01ee 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1378,20 +1378,18 @@ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
+ 
+ 
+ static int
+-virNetDevSetVfConfig(const char *ifname, int ifindex, int vf,
+-                     bool nltarget_kernel, const virMacAddr *macaddr,
+-                     int vlanid, uint32_t (*getPidFunc)(void))
++virNetDevSetVfConfig(const char *ifname, int vf,
++                     const virMacAddr *macaddr, int vlanid)
+ {
+     int rc = -1;
+     struct nlmsghdr *resp = NULL;
+     struct nlmsgerr *err;
+     unsigned int recvbuflen = 0;
+-    uint32_t pid = 0;
+     struct nl_msg *nl_msg;
+     struct nlattr *vfinfolist, *vfinfo;
+     struct ifinfomsg ifinfo = {
+         .ifi_family = AF_UNSPEC,
+-        .ifi_index  = ifindex
++        .ifi_index  = -1,
+     };
+ 
+     if (!macaddr && vlanid < 0)
+@@ -1445,15 +1443,7 @@ virNetDevSetVfConfig(const char *ifname, int ifindex, int vf,
+     nla_nest_end(nl_msg, vfinfo);
+     nla_nest_end(nl_msg, vfinfolist);
+ 
+-    if (!nltarget_kernel) {
+-        pid = getPidFunc();
+-        if (pid == 0) {
+-            rc = -1;
+-            goto cleanup;
+-        }
+-    }
+-
+-    if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, pid,
++    if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0,
+                           NETLINK_ROUTE, 0) < 0)
+         goto cleanup;
+ 
+@@ -1471,13 +1461,13 @@ virNetDevSetVfConfig(const char *ifname, int ifindex, int vf,
+ 
+             virReportSystemError(-err->error,
+                                  _("Cannot set interface MAC/vlanid to %s/%d "
+-                                   "for ifname %s ifindex %d vf %d"),
++                                   "for ifname %s vf %d"),
+                                  (macaddr
+                                   ? virMacAddrFormat(macaddr, macstr)
+                                   : "(unchanged)"),
+                                  vlanid,
+                                  ifname ? ifname : "(unspecified)",
+-                                 ifindex, vf);
++                                 vf);
+             goto cleanup;
+         }
+         break;
+@@ -1593,7 +1583,6 @@ virNetDevReplaceVfConfig(const char *pflinkdev, int vf,
+     char *path = NULL;
+     char macstr[VIR_MAC_STRING_BUFLEN];
+     char *fileData = NULL;
+-    int ifindex = -1;
+     bool pfIsOnline;
+ 
+     /* Assure that PF is online prior to twiddling with the VF.  It
+@@ -1633,8 +1622,7 @@ virNetDevReplaceVfConfig(const char *pflinkdev, int vf,
+         goto cleanup;
+     }
+ 
+-    ret = virNetDevSetVfConfig(pflinkdev, ifindex, vf, true,
+-                                macaddress, vlanid, NULL);
++    ret = virNetDevSetVfConfig(pflinkdev, vf, macaddress, vlanid);
+ 
+  cleanup:
+     VIR_FREE(path);
+@@ -1653,7 +1641,6 @@ virNetDevRestoreVfConfig(const char *pflinkdev,
+     char *vlan = NULL;
+     virMacAddr oldmac;
+     int vlanid = -1;
+-    int ifindex = -1;
+ 
+     if (virAsprintf(&path, "%s/%s_vf%d",
+                     stateDir, pflinkdev, vf) < 0)
+@@ -1696,8 +1683,7 @@ virNetDevRestoreVfConfig(const char *pflinkdev,
+     }
+ 
+     /*reset mac and remove file-ignore results*/
+-    rc = virNetDevSetVfConfig(pflinkdev, ifindex, vf, true,
+-                              &oldmac, vlanid, NULL);
++    rc = virNetDevSetVfConfig(pflinkdev, vf, &oldmac, vlanid);
+     ignore_value(unlink(path));
+ 
+  cleanup:
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-remove-unused-functions-from-virnetdev.c.patch b/SOURCES/libvirt-util-remove-unused-functions-from-virnetdev.c.patch
new file mode 100644
index 0000000..38e5897
--- /dev/null
+++ b/SOURCES/libvirt-util-remove-unused-functions-from-virnetdev.c.patch
@@ -0,0 +1,420 @@
+From 57e803e520ac98e747a35e5f7454ea6890efa1ee Mon Sep 17 00:00:00 2001
+Message-Id: <57e803e520ac98e747a35e5f7454ea6890efa1ee@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:35 -0400
+Subject: [PATCH] util: remove unused functions from virnetdev.c
+
+The global functions virNetDevReplaceMacAddress(),
+virNetDevReplaceNetConfig(), virNetDevRestoreMacAddress(), and
+virNetDevRestoreNetConfig() are no longer used, as their functionality
+has been replaced by virNetDev(Save|Read|Set)NetConfig().
+
+The static functions virNetDevReplaceVfConfig() and
+virNetDevRestoreVfConfig() were only used by the above-named global
+functions that were removed.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit bc4168f3e199a9167da544dfaa5847573a5f5d6b)
+---
+ src/libvirt_private.syms |   4 -
+ src/util/virnetdev.c     | 332 -----------------------------------------------
+ src/util/virnetdev.h     |   9 --
+ 3 files changed, 345 deletions(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 9b0bc0100..e2dbee92d 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -1901,10 +1901,6 @@ virNetDevIfStateTypeToString;
+ virNetDevIsVirtualFunction;
+ virNetDevPFGetVF;
+ virNetDevReadNetConfig;
+-virNetDevReplaceMacAddress;
+-virNetDevReplaceNetConfig;
+-virNetDevRestoreMacAddress;
+-virNetDevRestoreNetConfig;
+ virNetDevRunEthernetScript;
+ virNetDevRxFilterFree;
+ virNetDevRxFilterModeTypeFromString;
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index b61ed0f0b..4739f573a 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -391,92 +391,6 @@ int virNetDevGetMAC(const char *ifname,
+ #endif
+ 
+ 
+-/**
+- * virNetDevReplaceMacAddress:
+- * @macaddress: new MAC address for interface
+- * @linkdev: name of interface
+- * @stateDir: directory to store old MAC address
+- *
+- * Returns 0 on success, -1 on failure
+- *
+- */
+-int
+-virNetDevReplaceMacAddress(const char *linkdev,
+-                           const virMacAddr *macaddress,
+-                           const char *stateDir)
+-{
+-    virMacAddr oldmac;
+-    char *path = NULL;
+-    char macstr[VIR_MAC_STRING_BUFLEN];
+-    int ret = -1;
+-
+-    if (virNetDevGetMAC(linkdev, &oldmac) < 0)
+-        return -1;
+-
+-    if (virAsprintf(&path, "%s/%s",
+-                    stateDir,
+-                    linkdev) < 0)
+-        return -1;
+-    virMacAddrFormat(&oldmac, macstr);
+-    if (virFileWriteStr(path, macstr, O_CREAT|O_TRUNC|O_WRONLY) < 0) {
+-        virReportSystemError(errno, _("Unable to preserve mac for %s"),
+-                             linkdev);
+-        goto cleanup;
+-    }
+-
+-    if (virNetDevSetMAC(linkdev, macaddress) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
+- cleanup:
+-    VIR_FREE(path);
+-    return ret;
+-}
+-
+-/**
+- * virNetDevRestoreMacAddress:
+- * @linkdev: name of interface
+- * @stateDir: directory containing old MAC address
+- *
+- * Returns 0 on success, -errno on failure.
+- *
+- */
+-int
+-virNetDevRestoreMacAddress(const char *linkdev,
+-                           const char *stateDir)
+-{
+-    int rc = -1;
+-    char *oldmacname = NULL;
+-    char *macstr = NULL;
+-    char *path = NULL;
+-    virMacAddr oldmac;
+-
+-    if (virAsprintf(&path, "%s/%s",
+-                    stateDir,
+-                    linkdev) < 0)
+-        return -1;
+-
+-    if (virFileReadAll(path, VIR_MAC_STRING_BUFLEN, &macstr) < 0)
+-        goto cleanup;
+-
+-    if (virMacAddrParse(macstr, &oldmac) != 0) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-                       _("Cannot parse MAC address from '%s'"),
+-                       oldmacname);
+-        goto cleanup;
+-    }
+-
+-    /*reset mac and remove file-ignore results*/
+-    rc = virNetDevSetMAC(linkdev, &oldmac);
+-    ignore_value(unlink(path));
+-
+- cleanup:
+-    VIR_FREE(macstr);
+-    VIR_FREE(path);
+-    return rc;
+-}
+-
+-
+ #if defined(SIOCGIFMTU) && defined(HAVE_STRUCT_IFREQ)
+ /**
+  * virNetDevGetMTU:
+@@ -1679,229 +1593,6 @@ virNetDevGetVfConfig(const char *ifname, int vf, virMacAddrPtr mac,
+     return rc;
+ }
+ 
+-static int
+-virNetDevReplaceVfConfig(const char *pflinkdev, int vf,
+-                         const virMacAddr *macaddress,
+-                         int vlanid,
+-                         const char *stateDir)
+-{
+-    int ret = -1;
+-    virMacAddr oldmac;
+-    int oldvlanid = -1;
+-    char *path = NULL;
+-    char macstr[VIR_MAC_STRING_BUFLEN];
+-    char *fileData = NULL;
+-    bool pfIsOnline;
+-
+-    /* Assure that PF is online prior to twiddling with the VF.  It
+-     * *should* be, but if the PF isn't online the changes made to the
+-     * VF via the PF won't take effect, yet there will be no error
+-     * reported. In the case that it isn't online, fail and report the
+-     * error, since setting an unconfigured interface online
+-     * automatically turns on IPv6 autoconfig, which may not be what
+-     * the admin expects, so we want them to explicitly enable the PF
+-     * in the host system network config.
+-     */
+-    if (virNetDevGetOnline(pflinkdev, &pfIsOnline) < 0)
+-       goto cleanup;
+-    if (!pfIsOnline) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-                       _("Unable to configure VF %d of PF '%s' "
+-                         "because the PF is not online. Please "
+-                         "change host network config to put the "
+-                         "PF online."),
+-                       vf, pflinkdev);
+-        goto cleanup;
+-    }
+-
+-    if (virNetDevGetVfConfig(pflinkdev, vf, &oldmac, &oldvlanid) < 0)
+-        goto cleanup;
+-
+-    if (virAsprintf(&path, "%s/%s_vf%d",
+-                    stateDir, pflinkdev, vf) < 0)
+-        goto cleanup;
+-
+-    if (virAsprintf(&fileData, "%s\n%d\n",
+-                    virMacAddrFormat(&oldmac, macstr), oldvlanid) < 0)
+-        goto cleanup;
+-    if (virFileWriteStr(path, fileData, O_CREAT|O_TRUNC|O_WRONLY) < 0) {
+-        virReportSystemError(errno, _("Unable to preserve mac/vlan tag "
+-                                      "for pf = %s, vf = %d"), pflinkdev, vf);
+-        goto cleanup;
+-    }
+-
+-    ret = virNetDevSetVfConfig(pflinkdev, vf, macaddress, vlanid);
+-
+- cleanup:
+-    VIR_FREE(path);
+-    VIR_FREE(fileData);
+-    return ret;
+-}
+-
+-static int
+-virNetDevRestoreVfConfig(const char *pflinkdev,
+-                         int vf, const char *vflinkdev,
+-                         const char *stateDir)
+-{
+-    int rc = -1;
+-    char *path = NULL;
+-    char *fileData = NULL;
+-    char *vlan = NULL;
+-    virMacAddr oldmac;
+-    int vlanid = -1;
+-
+-    if (virAsprintf(&path, "%s/%s_vf%d",
+-                    stateDir, pflinkdev, vf) < 0)
+-        return rc;
+-
+-    if (vflinkdev && !virFileExists(path)) {
+-        /* this VF's config may have been stored with
+-         * virNetDevReplaceMacAddress while running an older version
+-         * of libvirt. If so, the ${pf}_vf${id} file won't exist. In
+-         * that case, try to restore using the older method with the
+-         * VF's name directly.
+-         */
+-        rc = virNetDevRestoreMacAddress(vflinkdev, stateDir);
+-        goto cleanup;
+-    }
+-
+-    if (virFileReadAll(path, 128, &fileData) < 0)
+-        goto cleanup;
+-
+-    if ((vlan = strchr(fileData, '\n'))) {
+-        char *endptr;
+-
+-        *vlan++ = 0; /* NULL terminate the mac address */
+-        if (*vlan) {
+-            if ((virStrToLong_i(vlan, &endptr, 10, &vlanid) < 0) ||
+-                (endptr && *endptr != '\n' && *endptr != 0)) {
+-                virReportError(VIR_ERR_INTERNAL_ERROR,
+-                               _("Cannot parse vlan tag from '%s'"),
+-                               vlan);
+-                goto cleanup;
+-            }
+-        }
+-    }
+-
+-    if (virMacAddrParse(fileData, &oldmac) != 0) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-                       _("Cannot parse MAC address from '%s'"),
+-                       fileData);
+-        goto cleanup;
+-    }
+-
+-    /*reset mac and remove file-ignore results*/
+-    rc = virNetDevSetVfConfig(pflinkdev, vf, &oldmac, vlanid);
+-    ignore_value(unlink(path));
+-
+- cleanup:
+-    VIR_FREE(path);
+-    VIR_FREE(fileData);
+-
+-    return rc;
+-}
+-
+-/**
+- * virNetDevReplaceNetConfig:
+- * @linkdev: name of the interface
+- * @vf: vf index if linkdev is a pf
+- * @macaddress: new MAC address for interface
+- * @vlanid: new vlanid
+- * @stateDir: directory to store old net config
+- *
+- * Returns 0 on success, -1 on failure
+- *
+- */
+-int
+-virNetDevReplaceNetConfig(const char *linkdev, int vf,
+-                          const virMacAddr *macaddress,
+-                          virNetDevVlanPtr vlan,
+-                          const char *stateDir)
+-{
+-    int ret = -1;
+-    char *pfdevname = NULL;
+-
+-    if (vf == -1 && virNetDevIsVirtualFunction(linkdev) == 1) {
+-        /* If this really *is* a VF and the caller just didn't know
+-         * it, we should set the MAC address via PF+vf# instead of
+-         * setting directly via VF, because the latter will be
+-         * rejected any time after the former has been done.
+-         */
+-        if (virNetDevGetPhysicalFunction(linkdev, &pfdevname) < 0)
+-            goto cleanup;
+-        if (virNetDevGetVirtualFunctionIndex(pfdevname, linkdev, &vf) < 0)
+-            goto cleanup;
+-        linkdev = pfdevname;
+-    }
+-
+-    if (vf == -1) {
+-        if (vlan) {
+-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+-                           _("vlan can only be set for SR-IOV VFs, but "
+-                             "%s is not a VF"), linkdev);
+-            goto cleanup;
+-        }
+-        ret = virNetDevReplaceMacAddress(linkdev, macaddress, stateDir);
+-    } else {
+-        int vlanid = 0; /* assure any current vlan tag is reset */
+-
+-        if (vlan) {
+-            if (vlan->nTags != 1 || vlan->trunk) {
+-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+-                               _("vlan trunking is not supported "
+-                                 "by SR-IOV network devices"));
+-                goto cleanup;
+-            }
+-            vlanid = vlan->tag[0];
+-        }
+-        ret = virNetDevReplaceVfConfig(linkdev, vf, macaddress, vlanid,
+-                                       stateDir);
+-    }
+-
+- cleanup:
+-    VIR_FREE(pfdevname);
+-    return ret;
+-}
+-
+-/**
+- * virNetDevRestoreNetConfig:
+- * @linkdev: name of the interface
+- * @vf: vf index if linkdev is a pf
+- * @stateDir: directory containing old net config
+- *
+- * Returns 0 on success, -errno on failure.
+- *
+- */
+-int
+-virNetDevRestoreNetConfig(const char *linkdev, int vf, const char *stateDir)
+-{
+-    int ret = -1;
+-    char *pfdevname = NULL;
+-    const char *vfdevname = NULL;
+-
+-    if (vf == -1 && virNetDevIsVirtualFunction(linkdev) == 1) {
+-        /* If this really *is* a VF and the caller just didn't know
+-         * it, we should set the MAC address via PF+vf# instead of
+-         * setting directly via VF, because the latter will be
+-         * rejected any time after the former has been done.
+-         */
+-        if (virNetDevGetPhysicalFunction(linkdev, &pfdevname) < 0)
+-            goto cleanup;
+-        if (virNetDevGetVirtualFunctionIndex(pfdevname, linkdev, &vf) < 0)
+-            goto cleanup;
+-        vfdevname = linkdev;
+-        linkdev = pfdevname;
+-    }
+-
+-    if (vf == -1)
+-        ret = virNetDevRestoreMacAddress(linkdev, stateDir);
+-    else
+-        ret = virNetDevRestoreVfConfig(linkdev, vf, vfdevname, stateDir);
+-
+- cleanup:
+-    VIR_FREE(pfdevname);
+-    return ret;
+-}
+ 
+ # define VIR_NETDEV_KEYNAME_ADMIN_MAC "adminMac"
+ # define VIR_NETDEV_KEYNAME_VLAN_TAG "vlanTag"
+@@ -2449,29 +2140,6 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+ 
+ #else /* defined(__linux__) && defined(HAVE_LIBNL)  && defined(IFLA_VF_MAX) */
+ 
+-int
+-virNetDevReplaceNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
+-                          int vf ATTRIBUTE_UNUSED,
+-                          const virMacAddr *macaddress ATTRIBUTE_UNUSED,
+-                          virNetDevVlanPtr vlan ATTRIBUTE_UNUSED,
+-                          const char *stateDir ATTRIBUTE_UNUSED)
+-{
+-    virReportSystemError(ENOSYS, "%s",
+-                         _("Unable to replace net config on this platform"));
+-    return -1;
+-
+-}
+-
+-int
+-virNetDevRestoreNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
+-                          int vf ATTRIBUTE_UNUSED,
+-                          const char *stateDir ATTRIBUTE_UNUSED)
+-{
+-    virReportSystemError(ENOSYS, "%s",
+-                         _("Unable to restore net config on this platform"));
+-    return -1;
+-}
+-
+ 
+ int
+ virNetDevSaveNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
+diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
+index b5abf7a7b..a097ba300 100644
+--- a/src/util/virnetdev.h
++++ b/src/util/virnetdev.h
+@@ -209,15 +209,6 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+                       bool setVLan)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
+ 
+-int virNetDevReplaceNetConfig(const char *linkdev, int vf,
+-                              const virMacAddr *macaddress,
+-                              virNetDevVlanPtr vlan,
+-                              const char *stateDir)
+-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(5);
+-
+-int virNetDevRestoreNetConfig(const char *linkdev, int vf, const char *stateDir)
+-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
+-
+ int virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname,
+                                     int *vf)
+     ATTRIBUTE_NONNULL(1);
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-rename-virHostdevNetConfigRestore-to-virHostdevRestoreNetConfig.patch b/SOURCES/libvirt-util-rename-virHostdevNetConfigRestore-to-virHostdevRestoreNetConfig.patch
new file mode 100644
index 0000000..b7694ed
--- /dev/null
+++ b/SOURCES/libvirt-util-rename-virHostdevNetConfigRestore-to-virHostdevRestoreNetConfig.patch
@@ -0,0 +1,57 @@
+From 8a5a8820ea8d67af38bd3100788fb413478f271d Mon Sep 17 00:00:00 2001
+Message-Id: <8a5a8820ea8d67af38bd3100788fb413478f271d@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:39 -0400
+Subject: [PATCH] util: rename virHostdevNetConfigRestore() to
+ virHostdevRestoreNetConfig()
+
+(cherry picked from commit 43da69158249318a7127ddca6a1813f03b18259c)
+
+https://bugzilla.redhat.com/1442040
+---
+ src/util/virhostdev.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index fe87fa7d7..6c7f47b17 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -500,7 +500,7 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
+  * case, try to find in the old state dir.
+  */
+ static int
+-virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
++virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
+                            const char *stateDir,
+                            const char *oldStateDir)
+ {
+@@ -839,7 +839,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
+  resetvfnetconfig:
+     if (last_processed_hostdev_vf >= 0) {
+         for (i = 0; i <= last_processed_hostdev_vf; i++)
+-            virHostdevNetConfigRestore(hostdevs[i], mgr->stateDir, NULL);
++            virHostdevRestoreNetConfig(hostdevs[i], mgr->stateDir, NULL);
+     }
+ 
+  reattachdevs:
+@@ -900,7 +900,7 @@ virHostdevReattachPCIDevice(virHostdevManagerPtr mgr,
+ }
+ 
+ /* @oldStateDir:
+- * For upgrade purpose: see virHostdevNetConfigRestore
++ * For upgrade purpose: see virHostdevRestoreNetConfig
+  */
+ void
+ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
+@@ -1001,7 +1001,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
+             if (actual) {
+                 VIR_DEBUG("Restoring network configuration of PCI device %s",
+                           virPCIDeviceGetName(actual));
+-                virHostdevNetConfigRestore(hostdev, mgr->stateDir,
++                virHostdevRestoreNetConfig(hostdev, mgr->stateDir,
+                                            oldStateDir);
+             }
+         }
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-replace-virHostdevNetConfigReplace-with-.-Save-Set-NetConfig.patch b/SOURCES/libvirt-util-replace-virHostdevNetConfigReplace-with-.-Save-Set-NetConfig.patch
new file mode 100644
index 0000000..23ff434
--- /dev/null
+++ b/SOURCES/libvirt-util-replace-virHostdevNetConfigReplace-with-.-Save-Set-NetConfig.patch
@@ -0,0 +1,158 @@
+From 75d8b7e1afe532a93605e8ec83878830238d1fc2 Mon Sep 17 00:00:00 2001
+Message-Id: <75d8b7e1afe532a93605e8ec83878830238d1fc2@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:32 -0400
+Subject: [PATCH] util: replace virHostdevNetConfigReplace with
+ ...(Save|Set)NetConfig()
+
+These two operations will need to be separated so that saving of the
+original config is done before detaching the host net driver, and
+setting the new config is done after attaching vfio-pci. This patch
+splits the single function into two, but for now calls them together
+(to make bisecting easier if there is a regression).
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit b684734bef7d475a5d3f20acf6d46c4a34e77d63)
+---
+ src/util/virhostdev.c | 93 ++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 70 insertions(+), 23 deletions(-)
+
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index a715aae12..b869ebc0c 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -390,10 +390,65 @@ virHostdevNetConfigVirtPortProfile(const char *linkdev, int vf,
+ }
+ 
+ 
++/**
++ * virHostdevSaveNetConfig:
++ * @hostdev: config object describing a hostdev device
++ * @stateDir: directory to save device state into
++ *
++ * If the given hostdev device is an SRIOV network VF and *does not*
++ * have a <virtualport> element (ie, it isn't being configured via
++ * 802.11Qbh), determine its PF+VF#, and use that to save its current
++ * "admin" MAC address and VF tag (the ones saved in the PF
++ * driver).
++ *
++ * Returns 0 on success, -1 on failure.
++ */
+ static int
+-virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
+-                           const unsigned char *uuid,
+-                           const char *stateDir)
++virHostdevSaveNetConfig(virDomainHostdevDefPtr hostdev,
++                        const char *stateDir)
++{
++    int ret = -1;
++    char *linkdev = NULL;
++    int vf = -1;
++
++    if (!virHostdevIsPCINetDevice(hostdev) ||
++        virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net))
++       return 0;
++
++    if (virHostdevIsVirtualFunction(hostdev) != 1) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("Interface type hostdev is currently supported on"
++                         " SR-IOV Virtual Functions only"));
++        goto cleanup;
++    }
++
++    if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
++        goto cleanup;
++
++    if (virNetDevSaveNetConfig(linkdev, vf, stateDir, true) < 0)
++        goto cleanup;
++
++    ret = 0;
++ cleanup:
++    VIR_FREE(linkdev);
++    return ret;
++}
++
++
++/**
++ * virHostdevSetNetConfig:
++ * @hostdev: config object describing a hostdev device
++ * @uuid: uuid of the domain
++ *
++ * If the given hostdev device is an SRIOV network VF, determine its
++ * PF+VF#, and use that to set the "admin" MAC address and VF tag (the
++ * ones saved in the PF driver).xs
++ *
++ * Returns 0 on success, -1 on failure.
++ */
++static int
++virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
++                       const unsigned char *uuid)
+ {
+     char *linkdev = NULL;
+     virNetDevVlanPtr vlan;
+@@ -402,12 +457,8 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
+     int vf = -1;
+     bool port_profile_associate = true;
+ 
+-    if (virHostdevIsVirtualFunction(hostdev) != 1) {
+-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+-                       _("Interface type hostdev is currently supported on"
+-                         " SR-IOV Virtual Functions only"));
+-        goto cleanup;
+-    }
++    if (!virHostdevIsPCINetDevice(hostdev))
++        return 0;
+ 
+     if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
+         goto cleanup;
+@@ -428,11 +479,6 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
+             goto cleanup;
+         }
+     } else {
+-        /* Save/Set only mac and vlan */
+-
+-        if (virNetDevSaveNetConfig(linkdev, vf, stateDir, true) < 0)
+-            goto cleanup;
+-
+         if (virNetDevSetNetConfig(linkdev, vf, &hostdev->parent.data.net->mac,
+                                   vlan, NULL, true) < 0) {
+             goto cleanup;
+@@ -445,6 +491,7 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
+     return ret;
+ }
+ 
++
+ /* @oldStateDir:
+  * For upgrade purpose:
+  * To an existing VM on QEMU, the hostdev netconfig file is originally stored
+@@ -660,16 +707,16 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
+     }
+ 
+     /* Step 4: For SRIOV network devices, Now that we have detached the
+-     * the network device, set the netdev config */
++     * the network device, set the new netdev config */
+     for (i = 0; i < nhostdevs; i++) {
+-         virDomainHostdevDefPtr hostdev = hostdevs[i];
+-         if (!virHostdevIsPCINetDevice(hostdev))
+-             continue;
+-         if (virHostdevNetConfigReplace(hostdev, uuid,
+-                                        mgr->stateDir) < 0) {
+-             goto resetvfnetconfig;
+-         }
+-         last_processed_hostdev_vf = i;
++
++        if (virHostdevSaveNetConfig(hostdevs[i], mgr->stateDir) < 0)
++            goto resetvfnetconfig;
++
++        if (virHostdevSetNetConfig(hostdevs[i], uuid) < 0)
++            goto resetvfnetconfig;
++
++        last_processed_hostdev_vf = i;
+     }
+ 
+     /* Step 5: Move devices from the inactive list to the active list */
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-save-hostdev-network-device-config-before-unbinding-from-host-driver.patch b/SOURCES/libvirt-util-save-hostdev-network-device-config-before-unbinding-from-host-driver.patch
new file mode 100644
index 0000000..1d5d3d7
--- /dev/null
+++ b/SOURCES/libvirt-util-save-hostdev-network-device-config-before-unbinding-from-host-driver.patch
@@ -0,0 +1,57 @@
+From bf59aaa70ce909af0fffb99575173730bae05e4e Mon Sep 17 00:00:00 2001
+Message-Id: <bf59aaa70ce909af0fffb99575173730bae05e4e@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:33 -0400
+Subject: [PATCH] util: save hostdev network device config before unbinding
+ from host driver
+
+In order to properly restore the original state of an SRIOV VF when
+we're finished with it, we need to save the MAC address of the VF
+itself (not just the admin MAC address for the VF that is stored in
+the PF). But that can only be done when the VF is still bound to the
+host's netdev driver, and we have always done the saving of device
+config after the VF is already bound to vfio-pci. This patch prepares
+us for adding a save of the VF's MAC by calling the function that
+saves netconfig earlier in the device preparation, before we've
+unbound it from the host netdev driver.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit cceada574e7b057c82927f7939c7491488e67463)
+---
+ src/util/virhostdev.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index b869ebc0c..f07e50d2c 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -620,6 +620,14 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
+         }
+     }
+ 
++    /* Step 1.5: For non-802.11Qbh SRIOV network devices, save the
++     * current device config
++     */
++    for (i = 0; i < nhostdevs; i++) {
++        if (virHostdevSaveNetConfig(hostdevs[i], mgr->stateDir) < 0)
++            goto cleanup;
++    }
++
+     /* Step 2: detach managed devices and make sure unmanaged devices
+      *         have already been taken care of */
+     for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
+@@ -710,9 +718,6 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
+      * the network device, set the new netdev config */
+     for (i = 0; i < nhostdevs; i++) {
+ 
+-        if (virHostdevSaveNetConfig(hostdevs[i], mgr->stateDir) < 0)
+-            goto resetvfnetconfig;
+-
+         if (virHostdevSetNetConfig(hostdevs[i], uuid) < 0)
+             goto resetvfnetconfig;
+ 
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-try-really-hard-to-set-the-MAC-address-of-an-SRIOV-VF.patch b/SOURCES/libvirt-util-try-really-hard-to-set-the-MAC-address-of-an-SRIOV-VF.patch
new file mode 100644
index 0000000..4b53795
--- /dev/null
+++ b/SOURCES/libvirt-util-try-really-hard-to-set-the-MAC-address-of-an-SRIOV-VF.patch
@@ -0,0 +1,196 @@
+From 61e603b025083ece8ebf12dc3664c0a5f613f400 Mon Sep 17 00:00:00 2001
+Message-Id: <61e603b025083ece8ebf12dc3664c0a5f613f400@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:37 -0400
+Subject: [PATCH] util: try *really* hard to set the MAC address of an SRIOV VF
+
+If an SRIOV VF has previously been used for VFIO device assignment,
+the "admin MAC" that is stored in the PF driver's table of VF info
+will have been set to the MAC address that the virtual machine wanted
+the device to have. Setting the admin MAC for a VF also sets a flag in
+the PF that is loosely called the "administratively set" flag. Once
+that flag is set, it is no longer possible for the net driver of the
+VF (either on the host or in a virtual machine) to directly set the
+VF's MAC again; this flag isn't reset until the *PF* driver is
+restarted, and that requires taking *all* VFs offline, so it's not
+really feasible to do.
+
+If the same SRIOV VF is later used for macvtap passthrough mode, the
+VF's MAC address must be set, but normally we don't unbind the VF from
+its host net driver (since we actually need the host net driver in
+this case). Since setting the VF MAC directly will fail, in the past
+"we" ("I") had tried to fix the problem by simply setting the admin MAC
+(via the PF) instead. This *appeared* to work (and might have at one
+time, due to promiscuous mode being turned on somewhere or something),
+but it currently creates a non-working interface because only the
+value for admin MAC is set to the desired value, *not* the actual MAC
+that the VF is using.
+
+Earlier patches in this series reverted that behavior, so that we once
+again set the MAC of the VF itself for macvtap passthrough operation,
+not the admin MAC. But that brings back the original bug - if the
+interface has been used for VFIO device assignment, you can no longer
+use it for macvtap passthrough.
+
+This patch solves that problem by noticing when virNetDevSetMAC()
+fails for a VF, and in that case it sets the desired MAC to the admin
+MAC via the PF, then "bounces" the VF driver (by unbinding and the
+immediately rebinding it to the VF). This causes the VF's MAC to be
+reinitialized from the admin MAC, and everybody is happy (until the
+*next* time someone wants to set the VF's MAC address, since the
+"administratively set" bit is still turned on).
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 86556e167a634599ac9975bd5dad98e3ef9f7017)
+---
+ src/util/virnetdev.c | 102 +++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 83 insertions(+), 19 deletions(-)
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index 0223877ff..a510ebc2e 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1054,6 +1054,32 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname,
+     return 0;
+ }
+ 
++
++static virPCIDevicePtr
++virNetDevGetPCIDevice(const char *devName)
++{
++    char *vfSysfsDevicePath = NULL;
++    virPCIDeviceAddressPtr vfPCIAddr = NULL;
++    virPCIDevicePtr vfPCIDevice = NULL;
++
++    if (virNetDevSysfsFile(&vfSysfsDevicePath, devName, "device") < 0)
++        goto cleanup;
++
++    vfPCIAddr = virPCIGetDeviceAddressFromSysfsLink(vfSysfsDevicePath);
++    if (!vfPCIAddr)
++        goto cleanup;
++
++    vfPCIDevice = virPCIDeviceNew(vfPCIAddr->domain, vfPCIAddr->bus,
++                                  vfPCIAddr->slot, vfPCIAddr->function);
++
++ cleanup:
++    VIR_FREE(vfSysfsDevicePath);
++    VIR_FREE(vfPCIAddr);
++
++    return vfPCIDevice;
++}
++
++
+ /**
+  * virNetDevGetVirtualFunctions:
+  *
+@@ -2001,6 +2027,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+     char *pfDevOrig = NULL;
+     char *vfDevOrig = NULL;
+     int vlanTag = -1;
++    virPCIDevicePtr vfPCIDevice = NULL;
+ 
+     if (vf >= 0) {
+         /* linkdev is the PF */
+@@ -2096,6 +2123,8 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+     }
+ 
+     if (MAC) {
++        int setMACrc;
++
+         if (!linkdev) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("VF %d of PF '%s' is not bound to a net driver, "
+@@ -2104,27 +2133,61 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+             goto cleanup;
+         }
+ 
+-        if (virNetDevSetMAC(linkdev, MAC) < 0) {
+-            /* This may have failed due to the "administratively
+-             * set" flag being set in the PF for this VF. For now
+-             * we will just fail, but in the future we should
+-             * attempt to set the VF MAC via the PF.
++        setMACrc = virNetDevSetMACInternal(linkdev, MAC, !!pfDevOrig);
++        if (setMACrc < 0) {
++            bool allowRetry = false;
++            int retries = 100;
++
++            /* if pfDevOrig == NULL, this isn't a VF, so we've failed */
++            if (!pfDevOrig || errno != EADDRNOTAVAIL)
++                goto cleanup;
++
++            /* Otherwise this is a VF, and virNetDevSetMAC failed with
++             * EADDRNOTAVAIL, which could be due to the
++             * "administratively set" flag being set in the PF for
++             * this VF.  When this happens, we can attempt to use an
++             * alternate method to set the VF MAC: first set it into
++             * the admin MAC for this VF in the PF, then unbind/rebind
++             * the VF from its net driver. This causes the VF's MAC to
++             * be initialized to whatever was stored in the admin MAC.
+              */
+-            goto cleanup;
++
++            if (virNetDevSetVfConfig(pfDevName, vf,
++                                     MAC, vlanTag, &allowRetry) < 0) {
++                goto cleanup;
++            }
++
++            /* admin MAC is set, now we need to construct a virPCIDevice
++             * object so we can call virPCIDeviceRebind()
++             */
++            if (!(vfPCIDevice = virNetDevGetPCIDevice(linkdev)))
++                goto cleanup;
++
++            /* Rebind the device. This should set the proper MAC address */
++            if (virPCIDeviceRebind(vfPCIDevice) < 0)
++                goto cleanup;
++
++            /* Wait until virNetDevGetIndex for the VF netdev returns success.
++             * This indicates that the device is ready to be used. If we don't
++             * wait, then upcoming operations on the VF may fail.
++             */
++            while (retries-- > 0 && !virNetDevExists(linkdev))
++               usleep(1000);
+         }
+-        if (pfDevOrig) {
+-            /* if pfDevOrig is set, it means that the caller was
+-             * *really* only interested in setting the MAC of the VF
+-             * itself, *not* the admin MAC via the PF. In those cases,
+-             * the adminMAC was only provided in case we need to set
+-             * the VF's MAC by temporarily unbinding/rebinding the
+-             * VF's net driver with the admin MAC set to the desired
+-             * MAC, and then want to restore the admin MAC to its
+-             * original setting when we're finished. We would only
+-             * need to do that if the virNetDevSetMAC() above had
+-             * failed; since it didn't, we don't need to set the
+-             * adminMAC, so we are NULLing it out here to avoid that
+-             * below.
++
++        if (pfDevOrig && setMACrc == 0) {
++            /* if pfDevOrig is set, it that the caller was *really*
++             * only interested in setting the MAC of the VF itself,
++             * *not* the admin MAC via the PF. In those cases, the
++             * adminMAC was only provided in case we need to set the
++             * VF's MAC by temporarily unbinding/rebinding the VF's
++             * net driver with the admin MAC set to the desired MAC,
++             * and then want to restore the admin MAC to its original
++             * setting when we're finished. We would only need to do
++             * that if the virNetDevSetMAC() above had failed; since
++             * setMACrc == 0, we know it didn't fail and we don't need
++             * to set the adminMAC, so we are NULLing it out here to
++             * avoid that below.
+ 
+              * (NB: since setting the admin MAC sets the
+              * "administratively set" flag for the VF in the PF's
+@@ -2168,6 +2231,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
+  cleanup:
+     VIR_FREE(pfDevOrig);
+     VIR_FREE(vfDevOrig);
++    virPCIDeviceFree(vfPCIDevice);
+     return ret;
+ }
+ 
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-use-cleanup-label-consistently-in-virHostdevNetConfigReplace.patch b/SOURCES/libvirt-util-use-cleanup-label-consistently-in-virHostdevNetConfigReplace.patch
new file mode 100644
index 0000000..ba5e697
--- /dev/null
+++ b/SOURCES/libvirt-util-use-cleanup-label-consistently-in-virHostdevNetConfigReplace.patch
@@ -0,0 +1,71 @@
+From 5f8a09506e65628954bd6ac1f67d99c0fe8cf757 Mon Sep 17 00:00:00 2001
+Message-Id: <5f8a09506e65628954bd6ac1f67d99c0fe8cf757@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:21 -0400
+Subject: [PATCH] util: use cleanup label consistently in
+ virHostdevNetConfigReplace()
+
+This will make an upcoming functional change more straightforward.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 19c5db749cdc3ddf53c2b23d5803a0f17cc5077a)
+---
+ src/util/virhostdev.c | 25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index 9b5ca6f41..1e4bb1e7d 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -393,15 +393,14 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                        _("Interface type hostdev is currently supported on"
+                          " SR-IOV Virtual Functions only"));
+-        return ret;
++        goto cleanup;
+     }
+ 
+     if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
+-        return ret;
++        goto cleanup;
+ 
+     vlan = virDomainNetGetActualVlan(hostdev->parent.data.net);
+-    virtPort = virDomainNetGetActualVirtPortProfile(
+-                                 hostdev->parent.data.net);
++    virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net);
+     if (virtPort) {
+         if (vlan) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+@@ -410,15 +409,21 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
+                            virNetDevVPortTypeToString(virtPort->virtPortType));
+             goto cleanup;
+         }
+-        ret = virHostdevNetConfigVirtPortProfile(linkdev, vf,
+-                            virtPort, &hostdev->parent.data.net->mac, uuid,
+-                            port_profile_associate);
++        if (virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
++                                               &hostdev->parent.data.net->mac,
++                                               uuid, port_profile_associate) < 0) {
++            goto cleanup;
++        }
+     } else {
+         /* Set only mac and vlan */
+-        ret = virNetDevReplaceNetConfig(linkdev, vf,
+-                                        &hostdev->parent.data.net->mac,
+-                                        vlan, stateDir);
++        if (virNetDevReplaceNetConfig(linkdev, vf,
++                                      &hostdev->parent.data.net->mac,
++                                      vlan, stateDir) < 0) {
++            goto cleanup;
++        }
+     }
++
++    ret = 0;
+  cleanup:
+     VIR_FREE(linkdev);
+     return ret;
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-use-new-virNetDev-NetConfig-functions-for-hostdev-setup-teardown.patch b/SOURCES/libvirt-util-use-new-virNetDev-NetConfig-functions-for-hostdev-setup-teardown.patch
new file mode 100644
index 0000000..386545e
--- /dev/null
+++ b/SOURCES/libvirt-util-use-new-virNetDev-NetConfig-functions-for-hostdev-setup-teardown.patch
@@ -0,0 +1,76 @@
+From 2dca449de05381494f6d7a0d126ae3a06b8d7120 Mon Sep 17 00:00:00 2001
+Message-Id: <2dca449de05381494f6d7a0d126ae3a06b8d7120@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:31 -0400
+Subject: [PATCH] util: use new virNetDev*NetConfig() functions for hostdev
+ setup/teardown
+
+virHostdevNetConfigReplace() and virHostdevNetConfigRestore() are
+modified to use the new virNetDev*NetConfig() functions.
+
+Note that due to the VF's original MAC addresses being saved after it
+has already been un-bound from the host net driver, the actual current
+VF MAC address won't be saved (because it no longer exists) - only the
+"admin MAC" will be saved. This reflects existing behavior that will
+be fixed in an upcoming patch.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit 9c004d55d02422b8eaa6db857372bdd4af3e26ed)
+---
+ src/util/virhostdev.c | 31 ++++++++++++++++++++++++-------
+ 1 file changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index 93b69501c..a715aae12 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -428,10 +428,13 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
+             goto cleanup;
+         }
+     } else {
+-        /* Set only mac and vlan */
+-        if (virNetDevReplaceNetConfig(linkdev, vf,
+-                                      &hostdev->parent.data.net->mac,
+-                                      vlan, stateDir) < 0) {
++        /* Save/Set only mac and vlan */
++
++        if (virNetDevSaveNetConfig(linkdev, vf, stateDir, true) < 0)
++            goto cleanup;
++
++        if (virNetDevSetNetConfig(linkdev, vf, &hostdev->parent.data.net->mac,
++                                  vlan, NULL, true) < 0) {
+             goto cleanup;
+         }
+     }
+@@ -484,9 +487,23 @@ virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
+                                                  NULL,
+                                                  port_profile_associate);
+     } else {
+-        ret = virNetDevRestoreNetConfig(linkdev, vf, stateDir);
+-        if (ret < 0 && oldStateDir != NULL)
+-            ret = virNetDevRestoreNetConfig(linkdev, vf, oldStateDir);
++        virMacAddrPtr MAC = NULL;
++        virMacAddrPtr adminMAC = NULL;
++        virNetDevVlanPtr vlan = NULL;
++
++        ret = virNetDevReadNetConfig(linkdev, vf, stateDir, &adminMAC, &vlan, &MAC);
++        if (ret < 0 && oldStateDir)
++            ret = virNetDevReadNetConfig(linkdev, vf, oldStateDir,
++                                         &adminMAC, &vlan, &MAC);
++
++        if (ret == 0) {
++            ignore_value(virNetDevSetNetConfig(linkdev, vf,
++                                               adminMAC, vlan, MAC, true));
++        }
++
++        VIR_FREE(MAC);
++        VIR_FREE(adminMAC);
++        virNetDevVlanFree(vlan);
+     }
+ 
+     VIR_FREE(linkdev);
+-- 
+2.12.2
+
diff --git a/SOURCES/libvirt-util-use-new-virNetDev-NetConfig-functions-for-macvtap-setup-teardown.patch b/SOURCES/libvirt-util-use-new-virNetDev-NetConfig-functions-for-macvtap-setup-teardown.patch
new file mode 100644
index 0000000..5d5f02c
--- /dev/null
+++ b/SOURCES/libvirt-util-use-new-virNetDev-NetConfig-functions-for-macvtap-setup-teardown.patch
@@ -0,0 +1,100 @@
+From 059b472059add9c1cfd4031a57143e92473976c1 Mon Sep 17 00:00:00 2001
+Message-Id: <059b472059add9c1cfd4031a57143e92473976c1@dist-git>
+From: Laine Stump <laine@laine.org>
+Date: Thu, 13 Apr 2017 14:29:30 -0400
+Subject: [PATCH] util: use new virNetDev*NetConfig() functions for macvtap
+ setup/teardown
+
+This patch modifies the macvtap passthrough setup to use
+virNetDevSaveNetConfig()+virNetDevSetConfig() instead of
+virNetDevReplaceNetConfig() or virNetDevReplaceMacAddress(), and the
+teardown to use virNetDevReadNetConfig()+virNetDevSetConfig() instead
+of virNetDevRestoreNetConfig() or virNetDevRestoreMacAddress().
+
+Since the older functions only saved/restored the admin MAC and vlan
+tag (which is incorrect) and the new functions save/restore the VF's
+own MAC address and vlan tag (correct), this actually fixes a bug
+(which was introduced by commit cb3fe38c7, which was itself supposed
+to be a fix for https://bugzilla.redhat.com/1113474 ).
+
+The downside to this patch is that it causes an *apparent* regression
+in that bug (because there will once again be an error reported if the
+interface had previously been used for VFIO device assignment), but in
+reality, the code hasn't been working for *any* case before this
+current patch (at least not with any recent kernel). Anyway, that
+"regression" will be fixed with an upcoming patch that fixes it the
+*right* way.
+
+Resolves: https://bugzilla.redhat.com/1442040 (RHEL 7.3.z)
+Resolves: https://bugzilla.redhat.com/1415609 (RHEL 7.4)
+
+(cherry picked from commit b91a33638476cf57d910b6056a8fc11921edd029)
+---
+ src/util/virnetdevmacvlan.c | 40 +++++++++++++++++++++++++---------------
+ 1 file changed, 25 insertions(+), 15 deletions(-)
+
+diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
+index 61da55415..40d64675e 100644
+--- a/src/util/virnetdevmacvlan.c
++++ b/src/util/virnetdevmacvlan.c
+@@ -1011,20 +1011,22 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested,
+      */
+ 
+     if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) {
++        bool setVlan = true;
++
+         if (virtPortProfile &&
+             virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH) {
+-            /* The Cisco enic driver (the only card that uses
+-             * 802.1Qbh) doesn't support IFLA_VFINFO_LIST, which is
+-             * required for virNetDevReplaceNetConfig(), so we must
+-             * use this function (which uses ioctl(SIOCGIFHWADDR)
+-             * instead or virNetDevReplaceNetConfig()
++            /* The Cisco enic driver (the only SRIOV-capable card that
++             * uses 802.1Qbh) doesn't support IFLA_VFINFO_LIST, which
++             * is required to get/set the vlan tag of a VF.
+              */
+-            if (virNetDevReplaceMacAddress(linkdev, macaddress, stateDir) < 0)
+-                return -1;
+-        } else {
+-            if (virNetDevReplaceNetConfig(linkdev, -1, macaddress, vlan, stateDir) < 0)
+-                return -1;
++            setVlan = false;
+         }
++
++        if (virNetDevSaveNetConfig(linkdev, -1, stateDir, setVlan) < 0)
++           return -1;
++
++        if (virNetDevSetNetConfig(linkdev, -1, NULL, vlan, macaddress, setVlan) < 0)
++           return -1;
+     }
+ 
+     if (ifnameRequested) {
+@@ -1205,11 +1207,19 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
+     }
+ 
+     if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) {
+-        if (virtPortProfile &&
+-             virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH)
+-            ignore_value(virNetDevRestoreMacAddress(linkdev, stateDir));
+-        else
+-            ignore_value(virNetDevRestoreNetConfig(linkdev, -1, stateDir));
++        virMacAddrPtr MAC = NULL;
++        virMacAddrPtr adminMAC = NULL;
++        virNetDevVlanPtr vlan = NULL;
++
++        if (virNetDevReadNetConfig(linkdev, -1, stateDir,
++                                   &adminMAC, &vlan, &MAC) == 0) {
++
++            ignore_value(virNetDevSetNetConfig(linkdev, -1,
++                                               adminMAC, vlan, MAC, !!vlan));
++            VIR_FREE(MAC);
++            VIR_FREE(adminMAC);
++            virNetDevVlanFree(vlan);
++        }
+     }
+ 
+     virNetlinkEventRemoveClient(0, macaddr, NETLINK_ROUTE);
+-- 
+2.12.2
+
diff --git a/SPECS/libvirt.spec b/SPECS/libvirt.spec
index c707107..01dc8b1 100644
--- a/SPECS/libvirt.spec
+++ b/SPECS/libvirt.spec
@@ -217,7 +217,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 2.0.0
-Release: 10%{?dist}.5%{?extra_release}
+Release: 10%{?dist}.9%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -508,6 +508,35 @@ Patch276: libvirt-qemuDomainAttachNetDevice-Avoid-originalError-leak.patch
 Patch277: libvirt-qemu-snapshot-Resume-VM-after-live-snapshot.patch
 Patch278: libvirt-qemu-Add-support-for-using-AES-secret-for-SCSI-hotplug.patch
 Patch279: libvirt-qemu-Don-t-assume-secret-provided-for-LUKS-encryption.patch
+Patch280: libvirt-qemu-Allow-empty-script-path-to-interface.patch
+Patch281: libvirt-Increase-default-file-handle-limits-for-daemons.patch
+Patch282: libvirt-util-permit-querying-a-VF-MAC-address-or-VLAN-tag-by-itself.patch
+Patch283: libvirt-util-remove-unused-args-from-virNetDevSetVfConfig.patch
+Patch284: libvirt-util-use-cleanup-label-consistently-in-virHostdevNetConfigReplace.patch
+Patch285: libvirt-util-eliminate-useless-local-variable.patch
+Patch286: libvirt-util-make-virMacAddrParse-more-versatile.patch
+Patch287: libvirt-util-change-virPCIGetNetName-to-not-return-error-if-device-has-no-net-name.patch
+Patch288: libvirt-util-make-virPCIGetDeviceAddressFromSysfsLink-public.patch
+Patch289: libvirt-util-new-function-virPCIDeviceRebind.patch
+Patch290: libvirt-util-new-internal-function-to-permit-silent-failure-of-virNetDevSetMAC.patch
+Patch291: libvirt-util-new-function-virNetDevPFGetVF.patch
+Patch292: libvirt-util-new-functions-virNetDev-Save-Read-Set-NetConfig.patch
+Patch293: libvirt-util-use-new-virNetDev-NetConfig-functions-for-macvtap-setup-teardown.patch
+Patch294: libvirt-util-use-new-virNetDev-NetConfig-functions-for-hostdev-setup-teardown.patch
+Patch295: libvirt-util-replace-virHostdevNetConfigReplace-with-.-Save-Set-NetConfig.patch
+Patch296: libvirt-util-save-hostdev-network-device-config-before-unbinding-from-host-driver.patch
+Patch297: libvirt-util-after-hostdev-assignment-restore-VF-MAC-address-via-setting-admin-MAC.patch
+Patch298: libvirt-util-remove-unused-functions-from-virnetdev.c.patch
+Patch299: libvirt-util-if-setting-admin-MAC-to-00-00-00-00-00-00-fails-try-02-00-00-00-00-00.patch
+Patch300: libvirt-util-try-really-hard-to-set-the-MAC-address-of-an-SRIOV-VF.patch
+Patch301: libvirt-util-log-all-setting-of-MAC-addresses-and-vlan-tags.patch
+Patch302: libvirt-util-rename-virHostdevNetConfigRestore-to-virHostdevRestoreNetConfig.patch
+Patch303: libvirt-util-allow-ignoring-SIOCSIFHWADDR-when-errno-is-EPERM.patch
+Patch304: libvirt-qemuDomainAttachNetDevice-Support-attach-of-type-user.patch
+Patch305: libvirt-conf-Rename-mode-parameter-in-virCPUDefParseXML.patch
+Patch306: libvirt-Add-support-for-CPU-cache-specification.patch
+Patch307: libvirt-RHEL-qemuxml2argvtest-Properly-reset-host-CPU-arch.patch
+Patch308: libvirt-qemu-Add-support-for-guest-CPU-cache.patch
 
 
 Requires: libvirt-daemon = %{version}-%{release}
@@ -2150,6 +2179,43 @@ exit 0
 
 
 %changelog
+* Thu May  4 2017 Jiri Denemark <jdenemar@redhat.com> - 2.0.0-10.el7_3.9
+- qemuDomainAttachNetDevice: Support attach of type="user" (rhbz#1445231)
+- conf: Rename mode parameter in virCPUDefParseXML (rhbz#1447612)
+- Add support for CPU cache specification (rhbz#1447612)
+- RHEL: qemuxml2argvtest: Properly reset host CPU arch (rhbz#1447612)
+- qemu: Add support for guest CPU cache (rhbz#1447612)
+
+* Mon Apr 24 2017 Jiri Denemark <jdenemar@redhat.com> - 2.0.0-10.el7_3.8
+- util: allow ignoring SIOCSIFHWADDR when errno is EPERM (rhbz#1442040)
+
+* Wed Apr 19 2017 Jiri Denemark <jdenemar@redhat.com> - 2.0.0-10.el7_3.7
+- Increase default file handle limits for daemons (rhbz#1442043)
+- util: permit querying a VF MAC address or VLAN tag by itself (rhbz#1442040)
+- util: remove unused args from virNetDevSetVfConfig() (rhbz#1442040)
+- util: use cleanup label consistently in virHostdevNetConfigReplace() (rhbz#1442040)
+- util: eliminate useless local variable (rhbz#1442040)
+- util: make virMacAddrParse more versatile (rhbz#1442040)
+- util: change virPCIGetNetName() to not return error if device has no net name (rhbz#1442040)
+- util: make virPCIGetDeviceAddressFromSysfsLink() public (rhbz#1442040)
+- util: new function virPCIDeviceRebind() (rhbz#1442040)
+- util: new internal function to permit silent failure of virNetDevSetMAC() (rhbz#1442040)
+- util: new function virNetDevPFGetVF() (rhbz#1442040)
+- util: new functions virNetDev(Save|Read|Set)NetConfig() (rhbz#1442040)
+- util: use new virNetDev*NetConfig() functions for macvtap setup/teardown (rhbz#1442040)
+- util: use new virNetDev*NetConfig() functions for hostdev setup/teardown (rhbz#1442040)
+- util: replace virHostdevNetConfigReplace with ...(Save|Set)NetConfig() (rhbz#1442040)
+- util: save hostdev network device config before unbinding from host driver (rhbz#1442040)
+- util: after hostdev assignment, restore VF MAC address via setting admin MAC (rhbz#1442040)
+- util: remove unused functions from virnetdev.c (rhbz#1442040)
+- util: if setting admin MAC to 00:00:00:00:00:00 fails, try 02:00:00:00:00:00 (rhbz#1442040)
+- util: try *really* hard to set the MAC address of an SRIOV VF (rhbz#1442040)
+- util: log all setting of MAC addresses and vlan tags (rhbz#1442040)
+- util: rename virHostdevNetConfigRestore() to virHostdevRestoreNetConfig() (rhbz#1442040)
+
+* Fri Mar 31 2017 Jiri Denemark <jdenemar@redhat.com> - 2.0.0-10.el7_3.6
+- qemu: Allow empty script path to <interface/> (rhbz#1429510)
+
 * Fri Feb 10 2017 Jiri Denemark <jdenemar@redhat.com> - 2.0.0-10.el7_3.5
 - qemu: Add support for using AES secret for SCSI hotplug (rhbz#1411398)
 - qemu: Don't assume secret provided for LUKS encryption (rhbz#1411394)