[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] pseries: Check for duplicate addresses on the
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 09/10] pseries: Check for duplicate addresses on the spapr-vio bus |
Date: |
Tue, 3 Jan 2012 16:08:21 +0100 |
From: Michael Ellerman <address@hidden>
Check that devices on the spapr vio bus aren't given duplicate
addresses. Currently we will not run with duplicate devices, the
fdt code will spot it, but the error reporting is not great. With
this patch we can report the error nicely in terms of the device
names given by the user.
Signed-off-by: Michael Ellerman <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/spapr_vio.c | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index cd03416..7a86dc8 100644
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -621,11 +621,43 @@ static void rtas_quiesce(sPAPREnvironment *spapr,
uint32_t token,
rtas_st(rets, 0, 0);
}
+static int spapr_vio_check_reg(VIOsPAPRDevice *sdev, VIOsPAPRDeviceInfo *info)
+{
+ VIOsPAPRDevice *other_sdev;
+ DeviceState *qdev;
+ VIOsPAPRBus *sbus;
+
+ sbus = DO_UPCAST(VIOsPAPRBus, bus, sdev->qdev.parent_bus);
+
+ /*
+ * Check two device aren't given clashing addresses by the user (or some
+ * other mechanism). We have to open code this because we have to check
+ * for matches with devices other than us.
+ */
+ QTAILQ_FOREACH(qdev, &sbus->bus.children, sibling) {
+ other_sdev = DO_UPCAST(VIOsPAPRDevice, qdev, qdev);
+
+ if (other_sdev != sdev && other_sdev->reg == sdev->reg) {
+ fprintf(stderr, "vio: %s and %s devices conflict at address %#x\n",
+ info->qdev.name, other_sdev->qdev.info->name, sdev->reg);
+ return -EEXIST;
+ }
+ }
+
+ return 0;
+}
+
static int spapr_vio_busdev_init(DeviceState *qdev, DeviceInfo *qinfo)
{
VIOsPAPRDeviceInfo *info = (VIOsPAPRDeviceInfo *)qinfo;
VIOsPAPRDevice *dev = (VIOsPAPRDevice *)qdev;
char *id;
+ int ret;
+
+ ret = spapr_vio_check_reg(dev, info);
+ if (ret) {
+ return ret;
+ }
/* Don't overwrite ids assigned on the command line */
if (!dev->qdev.id) {
--
1.6.0.2
- [Qemu-devel] [PULL 00/10] ppc patch queue 2012-01-03, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 02/10] console: Fix segfault on screendump without VGA adapter, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 05/10] pseries: FDT NUMA extensions to support multi-node guests, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 08/10] pseries: Populate "/chosen/linux, stdout-path" in the FDT, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 10/10] PPC: Add description for the Freescale e500mc core., Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 03/10] kvm-ppc: halt secondary cpus when guest reset, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 06/10] pseries: Emit device tree nodes in reg order, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 09/10] pseries: Check for duplicate addresses on the spapr-vio bus,
Alexander Graf <=
- [Qemu-devel] [PATCH 01/10] PPC: monitor: add ability to dump SLB entries, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 07/10] pseries: Add a routine to find a stable "default" vty and use it, Alexander Graf, 2012/01/03
- [Qemu-devel] [PATCH 04/10] pseries: Remove hcalls callback, Alexander Graf, 2012/01/03
- Re: [Qemu-devel] [PULL 00/10] ppc patch queue 2012-01-03, Aurelien Jarno, 2012/01/07