12:32 p.m.
These add a couple fixes for device assignment hotplug
---
Alex Williamson (2):
qemu: Release bus address on PCI host device remove
qemu: avoid corrupting guest info struct on host device PCI hot add
src/qemu/qemu_driver.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
12:33 p.m.
New subject: [libvirt] [PATCH 1/2] qemu: avoid corrupting guest info struct on host device PCI hot add
The device path doesn't make use of guestAddr, so the memcpy corrupts
the guest info struct.
Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com>
---
src/qemu/qemu_driver.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f027dc3..32ce835 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7654,7 +7654,6 @@ static int qemudDomainAttachHostPciDevice(struct qemud_driver
*driver,
qemuDomainObjPrivatePtr priv = vm->privateData;
pciDevice *pci;
int ret;
- virDomainDevicePCIAddress guestAddr;
char *devstr = NULL;
if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1) < 0) {
@@ -7689,20 +7688,24 @@ static int qemudDomainAttachHostPciDevice(struct qemud_driver
*driver,
if (!(devstr = qemuBuildPCIHostdevDevStr(hostdev)))
goto error;
- }
- qemuDomainObjEnterMonitorWithDriver(driver, vm);
- if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)
+ qemuDomainObjEnterMonitorWithDriver(driver, vm);
ret = qemuMonitorAddDevice(priv->mon, devstr);
- else
+ qemuDomainObjExitMonitorWithDriver(driver, vm);
+ } else {
+ virDomainDevicePCIAddress guestAddr;
+
+ qemuDomainObjEnterMonitorWithDriver(driver, vm);
ret = qemuMonitorAddPCIHostDevice(priv->mon,
&hostdev->source.subsys.u.pci,
&guestAddr);
- qemuDomainObjExitMonitorWithDriver(driver, vm);
+ qemuDomainObjExitMonitorWithDriver(driver, vm);
+
+ hostdev->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
+ memcpy(&hostdev->info.addr.pci, &guestAddr, sizeof(guestAddr));
+ }
if (ret < 0)
goto error;
- hostdev->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
- memcpy(&hostdev->info.addr.pci, &guestAddr, sizeof(guestAddr));
vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
12:49 p.m.
New subject: [libvirt] [PATCH 1/2] qemu: avoid corrupting guest info struct on host device PCI hot add
On Mon, May 24, 2010 at 01:33:27PM -0400, Alex Williamson wrote:
The device path doesn't make use of guestAddr, so the memcpy
corrupts
the guest info struct.
Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com>
---
src/qemu/qemu_driver.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f027dc3..32ce835 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7654,7 +7654,6 @@ static int qemudDomainAttachHostPciDevice(struct qemud_driver
*driver,
qemuDomainObjPrivatePtr priv = vm->privateData;
pciDevice *pci;
int ret;
- virDomainDevicePCIAddress guestAddr;
char *devstr = NULL;
if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1) < 0) {
@@ -7689,20 +7688,24 @@ static int qemudDomainAttachHostPciDevice(struct qemud_driver
*driver,
if (!(devstr = qemuBuildPCIHostdevDevStr(hostdev)))
goto error;
- }
- qemuDomainObjEnterMonitorWithDriver(driver, vm);
- if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)
+ qemuDomainObjEnterMonitorWithDriver(driver, vm);
ret = qemuMonitorAddDevice(priv->mon, devstr);
- else
+ qemuDomainObjExitMonitorWithDriver(driver, vm);
+ } else {
+ virDomainDevicePCIAddress guestAddr;
+
+ qemuDomainObjEnterMonitorWithDriver(driver, vm);
ret = qemuMonitorAddPCIHostDevice(priv->mon,
&hostdev->source.subsys.u.pci,
&guestAddr);
- qemuDomainObjExitMonitorWithDriver(driver, vm);
+ qemuDomainObjExitMonitorWithDriver(driver, vm);
+
+ hostdev->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
+ memcpy(&hostdev->info.addr.pci, &guestAddr, sizeof(guestAddr));
+ }
if (ret < 0)
goto error;
- hostdev->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
- memcpy(&hostdev->info.addr.pci, &guestAddr, sizeof(guestAddr));
vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
ACK
Net + disk hotplug have already got such fixes, somehow I missed PCI.
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
5:33 p.m.
New subject: [libvirt] [PATCH 1/2] qemu: avoid corrupting guest info struct on host device PCI hot add
On 05/24/2010 11:49 AM, Daniel P. Berrange wrote:
On Mon, May 24, 2010 at 01:33:27PM -0400, Alex Williamson wrote:
> The device path doesn't make use of guestAddr, so the memcpy corrupts
> the guest info struct.
>
> Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com>
ACK
Net + disk hotplug have already got such fixes, somehow I missed PCI.
Alex doesn't yet have push rights, so I went ahead and pushed this.
I'm also doing a followup patch to update AUTHORS with some recent
contributions, and pushing that as trivial (I can post it if requested,
but it is mostly mechanical, using the steps from commit 2a82a33e, so
for now I just pushed it without blasting all those email addresses to
web archives). Four new listings in just over one month; thanks to all
the continued contributions out there!
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
12:33 p.m.
New subject: [libvirt] [PATCH 2/2] qemu: Release bus address on PCI host device remove
Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com>
---
src/qemu/qemu_driver.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 32ce835..afdc718 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8625,6 +8625,10 @@ static int qemudDomainDetachHostPciDevice(struct qemud_driver
*driver,
pciFreeDevice(pci);
}
+ if (qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &detach->info) < 0)
{
+ VIR_WARN0("Unable to release PCI address on controller");
+ }
+
if (vm->def->nhostdevs > 1) {
memmove(vm->def->hostdevs + i,
vm->def->hostdevs + i + 1,
12:50 p.m.
New subject: [libvirt] [PATCH 2/2] qemu: Release bus address on PCI host device remove
On Mon, May 24, 2010 at 01:33:48PM -0400, Alex Williamson wrote:
Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com>
---
src/qemu/qemu_driver.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 32ce835..afdc718 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8625,6 +8625,10 @@ static int qemudDomainDetachHostPciDevice(struct qemud_driver
*driver,
pciFreeDevice(pci);
}
+ if (qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &detach->info) < 0)
{
+ VIR_WARN0("Unable to release PCI address on controller");
+ }
+
if (vm->def->nhostdevs > 1) {
memmove(vm->def->hostdevs + i,
vm->def->hostdevs + i + 1,
ACK
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
5299
days inactive
5299
days old
5 comments
3 participants
participants (3)
-
Alex Williamson -
Daniel P. Berrange -
Eric Blake