10:28 a.m.
One noted after push w/r/t change in news.xml and the other found after
I rebased to current head from recent commit.
John Ferlan (2):
news: Add <change> lost in merge
util: Remove NONNUL from virHostdevReAttachMediatedDevices
docs/news.xml | 2 ++
src/util/virhostdev.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--
2.9.3
10:29 a.m.
New subject: [libvirt] [PATCH 1/2] news: Add <change> lost in merge
Ensure to insert </change> <change> between items - lost during merge
resolution.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
docs/news.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/news.xml b/docs/news.xml
index 814bd93..3877984 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -51,6 +51,8 @@
enhanced check may also be requested when starting a new domain to
ensure the virtual CPU exactly matches the one specified in the XML.
</description>
+ </change>
+ <change>
<summary>
qemu: Add support to migrate using TLS
</summary>
--
2.9.3
11:23 a.m.
New subject: [libvirt] [PATCH 1/2] news: Add <change> lost in merge
On 03/27/2017 11:29 AM, John Ferlan wrote:
Ensure to insert </change> <change> between items - lost
during merge
resolution.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
docs/news.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/news.xml b/docs/news.xml
index 814bd93..3877984 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -51,6 +51,8 @@
enhanced check may also be requested when starting a new domain to
ensure the virtual CPU exactly matches the one specified in the XML.
</description>
+ </change>
+ <change>
<summary>
qemu: Add support to migrate using TLS
</summary>
ACK.
10:29 a.m.
New subject: [libvirt] [PATCH 2/2] util: Remove NONNUL from virHostdevReAttachMediatedDevices
Causes build failure when enabling static analysis
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/util/virhostdev.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index ff7c7b8..54e1c66 100644
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -140,7 +140,7 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPtr hostdev_mgr,
const char *dom_name,
virDomainHostdevDefPtr *hostdevs,
int nhostdevs)
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
+ ATTRIBUTE_NONNULL(1);
int
virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
virDomainHostdevDefPtr *hostdevs,
--
2.9.3
11:27 a.m.
New subject: [libvirt] [PATCH 2/2] util: Remove NONNUL from virHostdevReAttachMediatedDevices
On 03/27/2017 11:29 AM, John Ferlan wrote:
Causes build failure when enabling static analysis
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/util/virhostdev.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index ff7c7b8..54e1c66 100644
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -140,7 +140,7 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPtr hostdev_mgr,
const char *dom_name,
virDomainHostdevDefPtr *hostdevs,
int nhostdevs)
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
+ ATTRIBUTE_NONNULL(1);
int
virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
virDomainHostdevDefPtr *hostdevs,
ACK.
2827
days inactive
2827
days old
4 comments
2 participants
participants (2)
-
John Ferlan -
Laine Stump