--- src/qemu/qemu_command.c | 16 +++++++++++++--- src/qemu/qemu_command.h | 11 ----------- src/qemu/qemu_process.h | 2 -- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5d3ab3a..8943270 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1775,6 +1775,16 @@ qemuDomainPCIBusFullyReserved(virDomainPCIAddressBusPtr bus) } +static int +qemuAssignDevicePCISlots(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps, + virDomainPCIAddressSetPtr addrs); +static int +qemuDomainAssignPCIAddresses(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps, + virDomainObjPtr obj); + + int qemuDomainAssignAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps, virDomainObjPtr obj) @@ -1801,7 +1811,7 @@ int qemuDomainAssignAddresses(virDomainDefPtr def, } -virDomainPCIAddressSetPtr +static virDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def, unsigned int nbuses, bool dryRun) @@ -2238,7 +2248,7 @@ qemuValidateDevicePCISlotsChipsets(virDomainDefPtr def, return 0; } -int +static int qemuDomainAssignPCIAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps, virDomainObjPtr obj) @@ -2451,7 +2461,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, * function must only try to reserve addresses if info.type == NONE and * skip over info.type == PCI */ -int +static int qemuAssignDevicePCISlots(virDomainDefPtr def, virQEMUCapsPtr qemuCaps, virDomainPCIAddressSetPtr addrs) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index a96e57d..53bfda5 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -274,17 +274,6 @@ void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, const char *devstr); -int qemuDomainAssignPCIAddresses(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, - virDomainObjPtr obj); -virDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def, - unsigned int nbuses, - bool dryRun); - -int qemuAssignDevicePCISlots(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, - virDomainPCIAddressSetPtr addrs); - int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); int qemuDomainNetVLAN(virDomainNetDefPtr def); int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index c674111..cb5cee1 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -42,8 +42,6 @@ int qemuProcessStopCPUs(virQEMUDriverPtr driver, void qemuProcessAutostartAll(virQEMUDriverPtr driver); void qemuProcessReconnectAll(virConnectPtr conn, virQEMUDriverPtr driver); -int qemuProcessAssignPCIAddresses(virDomainDefPtr def); - typedef struct _qemuProcessIncomingDef qemuProcessIncomingDef; typedef qemuProcessIncomingDef *qemuProcessIncomingDefPtr; struct _qemuProcessIncomingDef { -- 2.5.0