Commit 2b5f4777 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160523-1' into staging 



usb: add xen pvUSB backend, add num-ports check to ohci.

# gpg: Signature made Mon 23 May 2016 14:02:25 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20160523-1:
  usb/ohci: Fix crash with when specifying too many num-ports
  xen: add pvUSB backend
  xen: write information about supported backends
  xen: introduce dummy system device

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 38629bf5 d400fc01

hw/usb/Makefile.objs

+4 −0
Original line number Diff line number Diff line
@@ -38,3 +38,7 @@ common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o 


# usb pass-through

common-obj-y += $(patsubst %,host-%.o,$(HOST_USB))



ifeq ($(CONFIG_USB_LIBUSB),y)

common-obj-$(CONFIG_XEN_BACKEND) += xen-usb.o

endif

hw/usb/hcd-ohci.c

+6 −0
Original line number Diff line number Diff line
@@ -1848,6 +1848,12 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, 


    ohci->as = as;



    if (num_ports > OHCI_MAX_PORTS) {

        error_setg(errp, "OHCI num-ports=%d is too big (limit is %d ports)",

                   num_ports, OHCI_MAX_PORTS);

        return;

    }



    if (usb_frame_time == 0) {

#ifdef OHCI_TIME_WARP

        usb_frame_time = NANOSECONDS_PER_SECOND;

hw/usb/xen-usb.c

0 → 100644
+1080 −0

File added.

Preview size limit exceeded, changes collapsed.

hw/xen/xen_backend.c

+63 −0
Original line number Diff line number Diff line
@@ -42,11 +42,36 @@ struct xs_handle *xenstore = NULL; 
const char *xen_protocol;



/* private */

struct xs_dirs {

    char *xs_dir;

    QTAILQ_ENTRY(xs_dirs) list;

};

static QTAILQ_HEAD(xs_dirs_head, xs_dirs) xs_cleanup =

    QTAILQ_HEAD_INITIALIZER(xs_cleanup);



static QTAILQ_HEAD(XenDeviceHead, XenDevice) xendevs = QTAILQ_HEAD_INITIALIZER(xendevs);

static int debug = 0;



/* ------------------------------------------------------------- */



static void xenstore_cleanup_dir(char *dir)

{

    struct xs_dirs *d;



    d = g_malloc(sizeof(*d));

    d->xs_dir = dir;

    QTAILQ_INSERT_TAIL(&xs_cleanup, d, list);

}



void xen_config_cleanup(void)

{

    struct xs_dirs *d;



    QTAILQ_FOREACH(d, &xs_cleanup, list) {

        xs_rm(xenstore, 0, d->xs_dir);

    }

}



int xenstore_write_str(const char *base, const char *node, const char *val)

{

    char abspath[XEN_BUFSIZE];
@@ -75,6 +100,30 @@ char *xenstore_read_str(const char *base, const char *node) 
    return ret;

}



int xenstore_mkdir(char *path, int p)

{

    struct xs_permissions perms[2] = {

        {

            .id    = 0, /* set owner: dom0 */

        }, {

            .id    = xen_domid,

            .perms = p,

        }

    };



    if (!xs_mkdir(xenstore, 0, path)) {

        xen_be_printf(NULL, 0, "xs_mkdir %s: failed\n", path);

        return -1;

    }

    xenstore_cleanup_dir(g_strdup(path));



    if (!xs_set_permissions(xenstore, 0, path, perms, 2)) {

        xen_be_printf(NULL, 0, "xs_set_permissions %s: failed\n", path);

        return -1;

    }

    return 0;

}



int xenstore_write_int(const char *base, const char *node, int ival)

{

    char val[12];
@@ -726,6 +775,20 @@ err: 


int xen_be_register(const char *type, struct XenDevOps *ops)

{

    char path[50];

    int rc;



    if (ops->backend_register) {

        rc = ops->backend_register();

        if (rc) {

            return rc;

        }

    }



    snprintf(path, sizeof(path), "device-model/%u/backends/%s", xen_domid,

             type);

    xenstore_mkdir(path, XS_PERM_NONE);



    return xenstore_scan(type, xen_domid, ops);

}

hw/xen/xen_devconfig.c

+2 −50
Original line number Diff line number Diff line
@@ -5,54 +5,6 @@ 


/* ------------------------------------------------------------- */



struct xs_dirs {

    char *xs_dir;

    QTAILQ_ENTRY(xs_dirs) list;

};

static QTAILQ_HEAD(xs_dirs_head, xs_dirs) xs_cleanup = QTAILQ_HEAD_INITIALIZER(xs_cleanup);



static void xen_config_cleanup_dir(char *dir)

{

    struct xs_dirs *d;



    d = g_malloc(sizeof(*d));

    d->xs_dir = dir;

    QTAILQ_INSERT_TAIL(&xs_cleanup, d, list);

}



void xen_config_cleanup(void)

{

    struct xs_dirs *d;



    QTAILQ_FOREACH(d, &xs_cleanup, list) {

	xs_rm(xenstore, 0, d->xs_dir);

    }

}



/* ------------------------------------------------------------- */



static int xen_config_dev_mkdir(char *dev, int p)

{

    struct xs_permissions perms[2] = {{

            .id    = 0, /* set owner: dom0 */

        },{

            .id    = xen_domid,

            .perms = p,

        }};



    if (!xs_mkdir(xenstore, 0, dev)) {

	xen_be_printf(NULL, 0, "xs_mkdir %s: failed\n", dev);

	return -1;

    }

    xen_config_cleanup_dir(g_strdup(dev));



    if (!xs_set_permissions(xenstore, 0, dev, perms, 2)) {

	xen_be_printf(NULL, 0, "xs_set_permissions %s: failed\n", dev);

	return -1;

    }

    return 0;

}



static int xen_config_dev_dirs(const char *ftype, const char *btype, int vdev,

			       char *fe, char *be, int len)

{
@@ -66,8 +18,8 @@ static int xen_config_dev_dirs(const char *ftype, const char *btype, int vdev, 
    snprintf(be, len, "%s/backend/%s/%d/%d", dom, btype, xen_domid, vdev);

    free(dom);



    xen_config_dev_mkdir(fe, XS_PERM_READ | XS_PERM_WRITE);

    xen_config_dev_mkdir(be, XS_PERM_READ);

    xenstore_mkdir(fe, XS_PERM_READ | XS_PERM_WRITE);

    xenstore_mkdir(be, XS_PERM_READ);

    return 0;

}