|
 |
6d3351 |
From 2d719331886e3f4ed927449ffde6a854e9deec1b Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <2d719331886e3f4ed927449ffde6a854e9deec1b@dist-git>
|
|
|
6d3351 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Date: Mon, 17 Jul 2017 12:08:59 +0200
|
|
|
6d3351 |
Subject: [PATCH] conf: Tweak virDomainPCIAddressGetNextAddr() signature
|
|
|
6d3351 |
|
|
|
6d3351 |
Move @function after @flags to match other functions in the
|
|
|
6d3351 |
same module like virDomainPCIAddressReserveNextAddr().
|
|
|
6d3351 |
|
|
|
6d3351 |
Also move virDomainPCIAddressReserveNextAddr() closer to
|
|
|
6d3351 |
virDomainPCIAddressReserveAddr() in the header file.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Reviewed-by: Laine Stump <laine@laine.org>
|
|
|
6d3351 |
(cherry picked from commit c949f6e69cbe91b9897e37e525181710f5c75b35)
|
|
|
6d3351 |
|
|
|
6d3351 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1431193
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/conf/domain_addr.c | 6 +++---
|
|
|
6d3351 |
src/conf/domain_addr.h | 12 ++++++------
|
|
|
6d3351 |
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
|
|
|
6d3351 |
index 0ae1ed93af..b17bb61a1d 100644
|
|
|
6d3351 |
--- a/src/conf/domain_addr.c
|
|
|
6d3351 |
+++ b/src/conf/domain_addr.c
|
|
|
6d3351 |
@@ -752,8 +752,8 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomainPCIAddressBusPtr bus,
|
|
|
6d3351 |
static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
|
|
|
6d3351 |
virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs,
|
|
|
6d3351 |
virPCIDeviceAddressPtr next_addr,
|
|
|
6d3351 |
- int function,
|
|
|
6d3351 |
- virDomainPCIConnectFlags flags)
|
|
|
6d3351 |
+ virDomainPCIConnectFlags flags,
|
|
|
6d3351 |
+ int function)
|
|
|
6d3351 |
{
|
|
|
6d3351 |
/* default to starting the search for a free slot from
|
|
|
6d3351 |
* the first slot of domain 0 bus 0...
|
|
|
6d3351 |
@@ -859,7 +859,7 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
|
|
|
6d3351 |
{
|
|
|
6d3351 |
virPCIDeviceAddress addr;
|
|
|
6d3351 |
|
|
|
6d3351 |
- if (virDomainPCIAddressGetNextAddr(addrs, &addr, function, flags) < 0)
|
|
|
6d3351 |
+ if (virDomainPCIAddressGetNextAddr(addrs, &addr, flags, function) < 0)
|
|
|
6d3351 |
return -1;
|
|
|
6d3351 |
|
|
|
6d3351 |
if (virDomainPCIAddressReserveAddrInternal(addrs, &addr, flags, false) < 0)
|
|
|
6d3351 |
diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
|
|
|
6d3351 |
index c90a335919..bb10f1abf3 100644
|
|
|
6d3351 |
--- a/src/conf/domain_addr.h
|
|
|
6d3351 |
+++ b/src/conf/domain_addr.h
|
|
|
6d3351 |
@@ -158,6 +158,12 @@ int virDomainPCIAddressReserveAddr(virDomainPCIAddressSetPtr addrs,
|
|
|
6d3351 |
virDomainPCIConnectFlags flags)
|
|
|
6d3351 |
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
|
|
|
6d3351 |
|
|
|
6d3351 |
+int virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
|
|
|
6d3351 |
+ virDomainDeviceInfoPtr dev,
|
|
|
6d3351 |
+ virDomainPCIConnectFlags flags,
|
|
|
6d3351 |
+ int function)
|
|
|
6d3351 |
+ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
|
|
|
6d3351 |
+
|
|
|
6d3351 |
int virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
|
|
|
6d3351 |
virDomainDeviceInfoPtr dev,
|
|
|
6d3351 |
virDomainPCIConnectFlags flags)
|
|
|
6d3351 |
@@ -167,12 +173,6 @@ int virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
|
|
|
6d3351 |
virPCIDeviceAddressPtr addr)
|
|
|
6d3351 |
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
|
|
|
6d3351 |
|
|
|
6d3351 |
-int virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
|
|
|
6d3351 |
- virDomainDeviceInfoPtr dev,
|
|
|
6d3351 |
- virDomainPCIConnectFlags flags,
|
|
|
6d3351 |
- int function)
|
|
|
6d3351 |
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
|
|
|
6d3351 |
-
|
|
|
6d3351 |
void virDomainPCIAddressSetAllMulti(virDomainDefPtr def)
|
|
|
6d3351 |
ATTRIBUTE_NONNULL(1);
|
|
|
6d3351 |
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.13.3
|
|
|
6d3351 |
|