Commit 5894145a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/sstabellini/xen-140507-2' into staging 



* remotes/sstabellini/xen-140507-2:
  xen_disk: add discard support
  pass an inclusive address range to xc_domain_pin_memory_cacheattr
  xen: factor out common functions
  xen: move Xen HVM files under hw/i386/xen
  xen: move Xen PV machine files to hw/xenpv
  qemu-xen: free all the pirqs for msi/msix when driver unload
  exec: Limit translation limiting in address_space_translate to xen

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b18a990c f3135204

Makefile.target

+4 −2
Original line number Diff line number Diff line
@@ -120,8 +120,10 @@ obj-y += dump.o 
LIBS+=$(libs_softmmu)



# xen support

obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o

obj-$(call lnot,$(CONFIG_XEN)) += xen-stub.o

obj-$(CONFIG_XEN) += xen-common.o

obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o

obj-$(call lnot,$(CONFIG_XEN)) += xen-common-stub.o

obj-$(call lnot,$(CONFIG_XEN_I386)) += xen-hvm-stub.o



# Hardware support

ifeq ($(TARGET_NAME), sparc64)

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ MemoryRegion *address_space_translate(AddressSpace *as, hwaddr addr, 
        as = iotlb.target_as;

    }



    if (memory_access_is_direct(mr, is_write)) {

    if (xen_enabled() && memory_access_is_direct(mr, is_write)) {

        hwaddr page = ((addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE) - addr;

        len = MIN(page, len);

    }

hw/block/xen_blkif.h

+12 −0
Original line number Diff line number Diff line
@@ -79,6 +79,12 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque 
	dst->handle = src->handle;

	dst->id = src->id;

	dst->sector_number = src->sector_number;

	if (src->operation == BLKIF_OP_DISCARD) {

		struct blkif_request_discard *s = (void *)src;

		struct blkif_request_discard *d = (void *)dst;

		d->nr_sectors = s->nr_sectors;

		return;

	}

	if (n > src->nr_segments)

		n = src->nr_segments;

	for (i = 0; i < n; i++)
@@ -94,6 +100,12 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque 
	dst->handle = src->handle;

	dst->id = src->id;

	dst->sector_number = src->sector_number;

	if (src->operation == BLKIF_OP_DISCARD) {

		struct blkif_request_discard *s = (void *)src;

		struct blkif_request_discard *d = (void *)dst;

		d->nr_sectors = s->nr_sectors;

		return;

	}

	if (n > src->nr_segments)

		n = src->nr_segments;

	for (i = 0; i < n; i++)

hw/block/xen_disk.c

+33 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct XenBlkDev { 
    int                 requests_finished;



    /* Persistent grants extension */

    gboolean            feature_discard;

    gboolean            feature_persistent;

    GTree               *persistent_gnts;

    unsigned int        persistent_gnt_count;
@@ -253,6 +254,8 @@ static int ioreq_parse(struct ioreq *ioreq) 
    case BLKIF_OP_WRITE:

        ioreq->prot = PROT_READ; /* from memory */

        break;

    case BLKIF_OP_DISCARD:

        return 0;

    default:

        xen_be_printf(&blkdev->xendev, 0, "error: unknown operation (%d)\n",

                      ioreq->req.operation);
@@ -492,6 +495,7 @@ static void qemu_aio_complete(void *opaque, int ret) 
    case BLKIF_OP_READ:

        bdrv_acct_done(ioreq->blkdev->bs, &ioreq->acct);

        break;

    case BLKIF_OP_DISCARD:

    default:

        break;

    }
@@ -532,6 +536,15 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) 
                        &ioreq->v, ioreq->v.size / BLOCK_SIZE,

                        qemu_aio_complete, ioreq);

        break;

    case BLKIF_OP_DISCARD:

    {

        struct blkif_request_discard *discard_req = (void *)&ioreq->req;

        ioreq->aio_inflight++;

        bdrv_aio_discard(blkdev->bs,

                        discard_req->sector_number, discard_req->nr_sectors,

                        qemu_aio_complete, ioreq);

        break;

    }

    default:

        /* unknown operation (shouldn't happen -- parse catches this) */

        goto err;
@@ -710,6 +723,21 @@ static void blk_alloc(struct XenDevice *xendev) 
    }

}



static void blk_parse_discard(struct XenBlkDev *blkdev)

{

    int enable;



    blkdev->feature_discard = true;



    if (xenstore_read_be_int(&blkdev->xendev, "discard-enable", &enable) == 0) {

        blkdev->feature_discard = !!enable;

    }



    if (blkdev->feature_discard) {

        xenstore_write_be_int(&blkdev->xendev, "feature-discard", 1);

    }

}



static int blk_init(struct XenDevice *xendev)

{

    struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
@@ -777,6 +805,8 @@ static int blk_init(struct XenDevice *xendev) 
    xenstore_write_be_int(&blkdev->xendev, "feature-persistent", 1);

    xenstore_write_be_int(&blkdev->xendev, "info", info);



    blk_parse_discard(blkdev);



    g_free(directiosafe);

    return 0;
@@ -812,6 +842,9 @@ static int blk_connect(struct XenDevice *xendev) 
        qflags |= BDRV_O_RDWR;

        readonly = false;

    }

    if (blkdev->feature_discard) {

        qflags |= BDRV_O_UNMAP;

    }



    /* init qemu block driver */

    index = (blkdev->xendev.dev - 202 * 256) / 16;

hw/i386/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ obj-$(CONFIG_KVM) += kvm/ 
obj-y += multiboot.o smbios.o

obj-y += pc.o pc_piix.o pc_q35.o

obj-y += pc_sysfw.o

obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o

obj-$(CONFIG_XEN) += ../xenpv/ xen/



obj-y += kvmvapic.o

obj-y += acpi-build.o