On 04/23/2013 10:45 AM, Laine Stump wrote:
> There will soon be other items related to pci hostdevs that need to be
> in the same part of the hostdevsubsys union as the pci address (which
> is currently a single member called "pci". This patch replaces the
> single member named pci with a struct named pci that contains a single
> member named "addr".
> ---
> src/conf/domain_audit.c | 8 ++++----
> src/conf/domain_conf.c | 12 ++++++------
> src/conf/domain_conf.h | 4 +++-
> src/network/bridge_driver.c | 24 +++++++++++------------
> src/qemu/qemu_command.c | 34 ++++++++++++++++----------------
> src/qemu/qemu_hostdev.c | 42 ++++++++++++++++++++--------------------
> src/qemu/qemu_hotplug.c | 14 +++++++-------
> src/security/security_apparmor.c | 8 ++++----
> src/security/security_dac.c | 16 +++++++--------
> src/security/security_selinux.c | 16 +++++++--------
> src/security/virt-aa-helper.c | 10 +++++-----
> src/xen/xend_internal.c | 10 +++++-----
> src/xenxs/xen_sxpr.c | 16 +++++++--------
> src/xenxs/xen_xm.c | 16 +++++++--------
> 14 files changed, 116 insertions(+), 114 deletions(-)
Mostly mechanical; the meat of the patch is:
> +++ b/src/conf/domain_conf.h
> @@ -399,7 +399,9 @@ struct _virDomainHostdevSubsys {
> unsigned vendor;
> unsigned product;
> } usb;
> - virDevicePCIAddress pci; /* host address */
> + struct {
> + virDevicePCIAddress addr; /* host address */
> + } pci;
> } u;
here. ACK.
> @@ -2343,8 +2343,8 @@ qemuDomainDetachHostPciDevice(virQEMUDriverPtr driver,
> if (qemuIsMultiFunctionDevice(vm->def, detach->info)) {
> virReportError(VIR_ERR_OPERATION_FAILED,
> _("cannot hot unplug multifunction PCI device: %.4x:%.2x:%.2x.%.1x"),
> - subsys->u.pci.domain, subsys->u.pci.bus,
> - subsys->u.pci.slot, subsys->u.pci.function);
> + subsys->u.pci.addr.domain, subsys->u.pci.addr.bus,
> + subsys->u.pci.addr.slot, subsys->u.pci.addr.function);
Spacing was unusual here, but that's pre-existing.
> goto cleanup;
> }
>
> @@ -2375,8 +2375,8 @@ qemuDomainDetachHostPciDevice(virQEMUDriverPtr driver,
>
> virObjectLock(driver->activePciHostdevs);
> virObjectLock(driver->inactivePciHostdevs);
> - pci = virPCIDeviceNew(subsys->u.pci.domain, subsys->u.pci.bus,
> - subsys->u.pci.slot, subsys->u.pci.function);
> + pci = virPCIDeviceNew(subsys->u.pci.addr.domain, subsys->u.pci.addr.bus,
> + subsys->u.pci.addr.slot, subsys->u.pci.addr.function);
And again.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list