[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/1] Fix assert when get default PCI address propert
From: |
Daniel Oram |
Subject: |
[Qemu-devel] [PATCH 1/1] Fix assert when get default PCI address property used by vfio-pci |
Date: |
Wed, 9 Nov 2016 18:36:20 +0000 |
Allow the PCIHostDeviceAddress structure to work as the host property in
vfio-pci when it has it's default value of all fields set to ~0. In this form
the property indicates a non-existant device but given the field bit sizes gets
asserted as excess (and invalid) precision overflows the string buffer. The BDF
of an invalid device "FFFF:FF:FF.F" is returned instead.
Signed-off-by: Daniel Oram <address@hidden>
---
hw/core/qdev-properties.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 311af6d..ed0d5b0 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -705,13 +705,21 @@ static void get_pci_host_devaddr(Object *obj, Visitor *v,
const char *name,
DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
PCIHostDeviceAddress *addr = qdev_get_prop_ptr(dev, prop);
- char buffer[] = "xxxx:xx:xx.x";
+ char buffer[] = "ffff:ff:ff.f";
char *p = buffer;
int rc = 0;
-
- rc = snprintf(buffer, sizeof(buffer), "%04x:%02x:%02x.%d",
- addr->domain, addr->bus, addr->slot, addr->function);
- assert(rc == sizeof(buffer) - 1);
+
+ /*
+ * Catch "invalid" device reference from vfio-pci and allow the
+ * default buffer representing the non-existant device to be used.
+ */
+ if (~addr->domain || ~addr->bus || ~addr->slot || ~addr->function) {
+
+ rc = snprintf(buffer, sizeof(buffer), "%04x:%02x:%02x.%0d",
+ addr->domain, addr->bus, addr->slot, addr->function);
+ assert(rc == sizeof(buffer) - 1);
+ }
+
visit_type_str(v, name, &p, errp);
}
--
2.10.2