qemu: Move qemuDomain*Address* functions

Create new modules qemu_domain_address.c and qemu_domain_address.h to
contain all the new functions and header data. Additionally move any
supporting static functions.

Make qemuDomainSupportsPCI non static.

Also, move and rename the following:

qemuSetSCSIControllerModel to qemuDomainSetSCSIControllerModel
qemuCollectPCIAddress to qemuDomainCollectPCIAddress
qemuValidateDevicePCISlotsPIIX3 to qemuDomainValidateDevicePCISlotsPIIX3
qemuAssignDevicePCISlots to qemuDomainAssignDevicePCISlots

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-02-15 13:08:02 -05:00
parent a0824823b7
commit 177db48734
8 changed files with 1681 additions and 1603 deletions

View File

@ -125,6 +125,7 @@ src/qemu/qemu_cgroup.c
src/qemu/qemu_command.c src/qemu/qemu_command.c
src/qemu/qemu_conf.c src/qemu/qemu_conf.c
src/qemu/qemu_domain.c src/qemu/qemu_domain.c
src/qemu/qemu_domain_address.c
src/qemu/qemu_driver.c src/qemu/qemu_driver.c
src/qemu/qemu_hostdev.c src/qemu/qemu_hostdev.c
src/qemu/qemu_hotplug.c src/qemu/qemu_hotplug.c

View File

@ -797,6 +797,7 @@ QEMU_DRIVER_SOURCES = \
qemu/qemu_command.c qemu/qemu_command.h \ qemu/qemu_command.c qemu/qemu_command.h \
qemu/qemu_parse_command.c qemu/qemu_parse_command.h \ qemu/qemu_parse_command.c qemu/qemu_parse_command.h \
qemu/qemu_domain.c qemu/qemu_domain.h \ qemu/qemu_domain.c qemu/qemu_domain.h \
qemu/qemu_domain_address.c qemu/qemu_domain_address.h \
qemu/qemu_cgroup.c qemu/qemu_cgroup.h \ qemu/qemu_cgroup.c qemu/qemu_cgroup.h \
qemu/qemu_hostdev.c qemu/qemu_hostdev.h \ qemu/qemu_hostdev.c qemu/qemu_hostdev.h \
qemu/qemu_hotplug.c qemu/qemu_hotplug.h \ qemu/qemu_hotplug.c qemu/qemu_hotplug.h \

File diff suppressed because it is too large Load Diff

View File

@ -30,6 +30,7 @@
# include "capabilities.h" # include "capabilities.h"
# include "qemu_conf.h" # include "qemu_conf.h"
# include "qemu_domain.h" # include "qemu_domain.h"
# include "qemu_domain_address.h"
# include "qemu_capabilities.h" # include "qemu_capabilities.h"
/* Config type for XML import/export conversions */ /* Config type for XML import/export conversions */
@ -232,18 +233,6 @@ int qemuOpenVhostNet(virDomainDefPtr def,
int qemuNetworkPrepareDevices(virDomainDefPtr def); int qemuNetworkPrepareDevices(virDomainDefPtr def);
int qemuDomainAssignAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
virDomainObjPtr obj)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps);
void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,
virDomainDeviceInfoPtr info,
const char *devstr);
int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);
int qemuDomainNetVLAN(virDomainNetDefPtr def); int qemuDomainNetVLAN(virDomainNetDefPtr def);
int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx); int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx);

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,45 @@
/*
* qemu_domain_address.h: QEMU domain address
*
* Copyright (C) 2006-2016 Red Hat, Inc.
* Copyright (C) 2006 Daniel P. Berrange
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* Author: Daniel P. Berrange <berrange@redhat.com>
*/
#ifndef __QEMU_DOMAIN_ADDRESS_H__
# include "domain_addr.h"
# include "domain_conf.h"
# include "qemu_capabilities.h"
int qemuDomainSetSCSIControllerModel(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
int *model);
int qemuDomainAssignAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
virDomainObjPtr obj)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,
virDomainDeviceInfoPtr info,
const char *devstr);
# define __QEMU_DOMAIN_ADDRESS_H__
#endif /* __QEMU_DOMAIN_ADDRESS_H__ */

View File

@ -28,6 +28,7 @@
#include "qemu_hotplugpriv.h" #include "qemu_hotplugpriv.h"
#include "qemu_capabilities.h" #include "qemu_capabilities.h"
#include "qemu_domain.h" #include "qemu_domain.h"
#include "qemu_domain_address.h"
#include "qemu_command.h" #include "qemu_command.h"
#include "qemu_hostdev.h" #include "qemu_hostdev.h"
#include "qemu_interface.h" #include "qemu_interface.h"

View File

@ -35,6 +35,7 @@
#include "qemu_process.h" #include "qemu_process.h"
#include "qemu_processpriv.h" #include "qemu_processpriv.h"
#include "qemu_domain.h" #include "qemu_domain.h"
#include "qemu_domain_address.h"
#include "qemu_cgroup.h" #include "qemu_cgroup.h"
#include "qemu_capabilities.h" #include "qemu_capabilities.h"
#include "qemu_monitor.h" #include "qemu_monitor.h"