Commit 60c5a47a authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'ehabkost/tags/machine-pull-request' into staging 



qdev: Fix assert in PCI address property when used by vfio-pci

# gpg: Signature made Tue 15 Nov 2016 06:27:18 PM GMT
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* ehabkost/tags/machine-pull-request:
  qdev: Fix assert in PCI address property when used by vfio-pci

Message-id: 1479234540-3192-1-git-send-email-ehabkost@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 82e6e5ef 00b87025

hw/core/qdev-properties.c

+10 −4
Original line number Diff line number Diff line
@@ -705,13 +705,19 @@ 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",

    /*

     * 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);

}