mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-28 14:00:44 +00:00
Merge remote-tracking branch 'sstabellini/xen-130729' into staging
# By Paul Durrant (1) and Stefano Stabellini (1) # Via Stefano Stabellini * sstabellini/xen-130729: Xen PV Device xen_disk: support "direct-io-safe" backend option Message-id: 1375096790-12815-1-git-send-email-stefano.stabellini@eu.citrix.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
commit
fdc43322c9
@ -93,6 +93,7 @@ struct XenBlkDev {
|
||||
char *type;
|
||||
char *dev;
|
||||
char *devtype;
|
||||
bool directiosafe;
|
||||
const char *fileproto;
|
||||
const char *filename;
|
||||
int ring_ref;
|
||||
@ -701,6 +702,7 @@ static int blk_init(struct XenDevice *xendev)
|
||||
{
|
||||
struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
|
||||
int info = 0;
|
||||
char *directiosafe = NULL;
|
||||
|
||||
/* read xenstore entries */
|
||||
if (blkdev->params == NULL) {
|
||||
@ -733,6 +735,8 @@ static int blk_init(struct XenDevice *xendev)
|
||||
if (blkdev->devtype == NULL) {
|
||||
blkdev->devtype = xenstore_read_be_str(&blkdev->xendev, "device-type");
|
||||
}
|
||||
directiosafe = xenstore_read_be_str(&blkdev->xendev, "direct-io-safe");
|
||||
blkdev->directiosafe = (directiosafe && atoi(directiosafe));
|
||||
|
||||
/* do we have all we need? */
|
||||
if (blkdev->params == NULL ||
|
||||
@ -760,6 +764,8 @@ static int blk_init(struct XenDevice *xendev)
|
||||
xenstore_write_be_int(&blkdev->xendev, "feature-flush-cache", 1);
|
||||
xenstore_write_be_int(&blkdev->xendev, "feature-persistent", 1);
|
||||
xenstore_write_be_int(&blkdev->xendev, "info", info);
|
||||
|
||||
g_free(directiosafe);
|
||||
return 0;
|
||||
|
||||
out_error:
|
||||
@ -773,6 +779,8 @@ out_error:
|
||||
blkdev->dev = NULL;
|
||||
g_free(blkdev->devtype);
|
||||
blkdev->devtype = NULL;
|
||||
g_free(directiosafe);
|
||||
blkdev->directiosafe = false;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -783,7 +791,11 @@ static int blk_connect(struct XenDevice *xendev)
|
||||
bool readonly = true;
|
||||
|
||||
/* read-only ? */
|
||||
qflags = BDRV_O_CACHE_WB | BDRV_O_NATIVE_AIO;
|
||||
if (blkdev->directiosafe) {
|
||||
qflags = BDRV_O_NOCACHE | BDRV_O_NATIVE_AIO;
|
||||
} else {
|
||||
qflags = BDRV_O_CACHE_WB;
|
||||
}
|
||||
if (strcmp(blkdev->mode, "w") == 0) {
|
||||
qflags |= BDRV_O_RDWR;
|
||||
readonly = false;
|
||||
|
@ -1,6 +1,6 @@
|
||||
# xen backend driver support
|
||||
common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o
|
||||
|
||||
obj-$(CONFIG_XEN_I386) += xen_platform.o xen_apic.o
|
||||
obj-$(CONFIG_XEN_I386) += xen_platform.o xen_apic.o xen_pvdevice.o
|
||||
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
|
||||
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o
|
||||
|
131
hw/xen/xen_pvdevice.c
Normal file
131
hw/xen/xen_pvdevice.c
Normal file
@ -0,0 +1,131 @@
|
||||
/* Copyright (c) Citrix Systems Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms,
|
||||
* with or without modification, are permitted provided
|
||||
* that the following conditions are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above
|
||||
* copyright notice, this list of conditions and the
|
||||
* following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the
|
||||
* following disclaimer in the documentation and/or other
|
||||
* materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "hw/hw.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "trace.h"
|
||||
|
||||
#define TYPE_XEN_PV_DEVICE "xen-pvdevice"
|
||||
|
||||
#define XEN_PV_DEVICE(obj) \
|
||||
OBJECT_CHECK(XenPVDevice, (obj), TYPE_XEN_PV_DEVICE)
|
||||
|
||||
typedef struct XenPVDevice {
|
||||
/*< private >*/
|
||||
PCIDevice parent_obj;
|
||||
/*< public >*/
|
||||
uint16_t vendor_id;
|
||||
uint16_t device_id;
|
||||
uint8_t revision;
|
||||
uint32_t size;
|
||||
MemoryRegion mmio;
|
||||
} XenPVDevice;
|
||||
|
||||
static uint64_t xen_pv_mmio_read(void *opaque, hwaddr addr,
|
||||
unsigned size)
|
||||
{
|
||||
trace_xen_pv_mmio_read(addr);
|
||||
|
||||
return ~(uint64_t)0;
|
||||
}
|
||||
|
||||
static void xen_pv_mmio_write(void *opaque, hwaddr addr,
|
||||
uint64_t val, unsigned size)
|
||||
{
|
||||
trace_xen_pv_mmio_write(addr);
|
||||
}
|
||||
|
||||
static const MemoryRegionOps xen_pv_mmio_ops = {
|
||||
.read = &xen_pv_mmio_read,
|
||||
.write = &xen_pv_mmio_write,
|
||||
.endianness = DEVICE_LITTLE_ENDIAN,
|
||||
};
|
||||
|
||||
static int xen_pv_init(PCIDevice *pci_dev)
|
||||
{
|
||||
XenPVDevice *d = XEN_PV_DEVICE(pci_dev);
|
||||
uint8_t *pci_conf;
|
||||
|
||||
pci_conf = pci_dev->config;
|
||||
|
||||
pci_set_word(pci_conf + PCI_VENDOR_ID, d->vendor_id);
|
||||
pci_set_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID, d->vendor_id);
|
||||
pci_set_word(pci_conf + PCI_DEVICE_ID, d->device_id);
|
||||
pci_set_word(pci_conf + PCI_SUBSYSTEM_ID, d->device_id);
|
||||
pci_set_byte(pci_conf + PCI_REVISION_ID, d->revision);
|
||||
|
||||
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_MEMORY);
|
||||
|
||||
pci_config_set_prog_interface(pci_conf, 0);
|
||||
|
||||
pci_conf[PCI_INTERRUPT_PIN] = 1;
|
||||
|
||||
memory_region_init_io(&d->mmio, NULL, &xen_pv_mmio_ops, d,
|
||||
"mmio", d->size);
|
||||
|
||||
pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_MEM_PREFETCH,
|
||||
&d->mmio);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static Property xen_pv_props[] = {
|
||||
DEFINE_PROP_UINT16("vendor-id", XenPVDevice, vendor_id, PCI_VENDOR_ID_XEN),
|
||||
DEFINE_PROP_UINT16("device-id", XenPVDevice, device_id, PCI_DEVICE_ID_XEN_PVDEVICE),
|
||||
DEFINE_PROP_UINT8("revision", XenPVDevice, revision, 0x01),
|
||||
DEFINE_PROP_UINT32("size", XenPVDevice, size, 0x400000),
|
||||
DEFINE_PROP_END_OF_LIST()
|
||||
};
|
||||
|
||||
static void xen_pv_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
||||
|
||||
k->init = xen_pv_init;
|
||||
k->class_id = PCI_CLASS_SYSTEM_OTHER;
|
||||
dc->desc = "Xen PV Device";
|
||||
dc->props = xen_pv_props;
|
||||
}
|
||||
|
||||
static const TypeInfo xen_pv_type_info = {
|
||||
.name = TYPE_XEN_PV_DEVICE,
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(XenPVDevice),
|
||||
.class_init = xen_pv_class_init,
|
||||
};
|
||||
|
||||
static void xen_pv_register_types(void)
|
||||
{
|
||||
type_register_static(&xen_pv_type_info);
|
||||
}
|
||||
|
||||
type_init(xen_pv_register_types)
|
@ -145,6 +145,7 @@
|
||||
|
||||
#define PCI_VENDOR_ID_XEN 0x5853
|
||||
#define PCI_DEVICE_ID_XEN_PLATFORM 0x0001
|
||||
#define PCI_DEVICE_ID_XEN_PVDEVICE 0x0002
|
||||
|
||||
#define PCI_VENDOR_ID_NEC 0x1033
|
||||
#define PCI_DEVICE_ID_NEC_UPD720200 0x0194
|
||||
|
@ -1168,3 +1168,7 @@ kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d"
|
||||
# qom/object.c
|
||||
object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)"
|
||||
object_class_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)"
|
||||
|
||||
# hw/xen/xen_pvdevice.c
|
||||
xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address %"PRIx64")"
|
||||
xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address %"PRIx64")"
|
||||
|
Loading…
Reference in New Issue
Block a user