The following changes since commit 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e:
Open 2.0 development tree (2013-11-27 14:02:45 -0800)
are available in the git repository at:
git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-2013-12-01
for you to fetch changes up to 539891a85d17bd8c23a2547e52e26993350d2c3a:
xen-pvdevice: make device-id property compulsory (2013-12-01 18:25:48 +0000)
----------------------------------------------------------------
Paul Durrant (1):
xen-pvdevice: make device-id property compulsory
Wei Liu (1):
xen: fix two errors when debug is enabled
hw/xen/xen_pt.c | 3 ++-
hw/xen/xen_pvdevice.c | 6 +++++-
include/hw/pci/pci_ids.h | 1 -
xen-all.c | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
Stefano Stabellini
2013-Dec-01 18:33 UTC
[PULL 1/2] xen: fix two errors when debug is enabled
From: Wei Liu <wei.liu2@citrix.com>
This patch fixes:
1. build error in xen_pt.c when XEN_PT_LOGGING_ENABLED is defined
2. debug output format string error when DEBUG_XEN is defined
In the second case I also have the output info in consistent with the
output in mapping function - that is, print start_addr instead of
phys_offset.
Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
hw/xen/xen_pt.c | 3 ++-
xen-all.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index ca2d460..d58cb61 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -570,7 +570,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s,
if (args.rc) {
XEN_PT_WARN(d, "Region: %d (addr: %#"FMT_PCIBUS
", len: %#"FMT_PCIBUS") is
overlapped.\n",
- bar, sec->offset_within_address_space, sec->size);
+ bar, sec->offset_within_address_space,
+ int128_get64(sec->size));
}
if (d->io_regions[bar].type & PCI_BASE_ADDRESS_SPACE_IO) {
diff --git a/xen-all.c b/xen-all.c
index 9a27899..4a594bd 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -369,8 +369,8 @@ static int xen_remove_from_physmap(XenIOState *state,
phys_offset = physmap->phys_offset;
size = physmap->size;
- DPRINTF("unmapping vram to %"HWADDR_PRIx" -
%"HWADDR_PRIx", from ",
- "%"HWADDR_PRIx"\n", phys_offset, phys_offset +
size, start_addr);
+ DPRINTF("unmapping vram to %"HWADDR_PRIx" -
%"HWADDR_PRIx", at "
+ "%"HWADDR_PRIx"\n", start_addr, start_addr +
size, phys_offset);
size >>= TARGET_PAGE_BITS;
start_addr >>= TARGET_PAGE_BITS;
--
1.7.10.4
Stefano Stabellini
2013-Dec-01 18:33 UTC
[PULL 2/2] xen-pvdevice: make device-id property compulsory
From: Paul Durrant <paul.durrant@citrix.com>
The intention of the Xen PV device is that it is used as a parent
device for PV drivers in Xen HVM guests and the set of PV drivers that
bind to the device is determined by its device ID (and possibly
vendor ID and revision). As such, the device should not have a default
device ID, it should always be supplied by the Xen toolstack.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
hw/xen/xen_pvdevice.c | 6 +++++-
include/hw/pci/pci_ids.h | 1 -
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/xen/xen_pvdevice.c b/hw/xen/xen_pvdevice.c
index 1132c89..c218947 100644
--- a/hw/xen/xen_pvdevice.c
+++ b/hw/xen/xen_pvdevice.c
@@ -74,6 +74,10 @@ static int xen_pv_init(PCIDevice *pci_dev)
XenPVDevice *d = XEN_PV_DEVICE(pci_dev);
uint8_t *pci_conf;
+ /* device-id property must always be supplied */
+ if (d->device_id == 0xffff)
+ return -1;
+
pci_conf = pci_dev->config;
pci_set_word(pci_conf + PCI_VENDOR_ID, d->vendor_id);
@@ -99,7 +103,7 @@ static int xen_pv_init(PCIDevice *pci_dev)
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_UINT16("device-id", XenPVDevice, device_id, 0xffff),
DEFINE_PROP_UINT8("revision", XenPVDevice, revision, 0x01),
DEFINE_PROP_UINT32("size", XenPVDevice, size, 0x400000),
DEFINE_PROP_END_OF_LIST()
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
index 4c0002b..e597070 100644
--- a/include/hw/pci/pci_ids.h
+++ b/include/hw/pci/pci_ids.h
@@ -146,7 +146,6 @@
#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
--
1.7.10.4