summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/misc/mmio_interface.c2
-rw-r--r--target/unicore32/softmmu.c8
-rw-r--r--tests/libqtest.h8
-rwxr-xr-xtests/qemu-iotests/check13
-rw-r--r--tests/qemu-iotests/common.rc5
5 files changed, 11 insertions, 25 deletions
diff --git a/hw/misc/mmio_interface.c b/hw/misc/mmio_interface.c
index 6f004d2bab..da154e5c95 100644
--- a/hw/misc/mmio_interface.c
+++ b/hw/misc/mmio_interface.c
@@ -63,10 +63,12 @@ static void mmio_interface_realize(DeviceState *dev, Error **errp)
if (!s->host_ptr) {
error_setg(errp, "host_ptr property must be set");
+ return;
}
if (!s->subregion) {
error_setg(errp, "subregion property must be set");
+ return;
}
memory_region_init_ram_ptr(&s->ram_mem, OBJECT(s), "ram",
diff --git a/target/unicore32/softmmu.c b/target/unicore32/softmmu.c
index e7152e72e0..d8d76968f3 100644
--- a/target/unicore32/softmmu.c
+++ b/target/unicore32/softmmu.c
@@ -15,6 +15,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
+#include "qemu/error-report.h"
#undef DEBUG_UC32
@@ -271,8 +272,7 @@ int uc32_cpu_handle_mmu_fault(CPUState *cs, vaddr address,
hwaddr uc32_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
{
- UniCore32CPU *cpu = UNICORE32_CPU(cs);
-
- cpu_abort(CPU(cpu), "%s not supported yet\n", __func__);
- return addr;
+ error_report("function uc32_cpu_get_phys_page_debug not "
+ "implemented, aborting");
+ return -1;
}
diff --git a/tests/libqtest.h b/tests/libqtest.h
index 38bc1e9953..3ae570927a 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -117,7 +117,7 @@ QDict *qtest_qmp_receive(QTestState *s);
* @s: #QTestState instance to operate on.
* @s: #event event to wait for.
*
- * Continuosly polls for QMP responses until it receives the desired event.
+ * Continuously polls for QMP responses until it receives the desired event.
*/
void qtest_qmp_eventwait(QTestState *s, const char *event);
@@ -126,7 +126,7 @@ void qtest_qmp_eventwait(QTestState *s, const char *event);
* @s: #QTestState instance to operate on.
* @s: #event event to wait for.
*
- * Continuosly polls for QMP responses until it receives the desired event.
+ * Continuously polls for QMP responses until it receives the desired event.
* Returns a copy of the event for further investigation.
*/
QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event);
@@ -571,7 +571,7 @@ static inline QDict *qmp_receive(void)
* qmp_eventwait:
* @s: #event event to wait for.
*
- * Continuosly polls for QMP responses until it receives the desired event.
+ * Continuously polls for QMP responses until it receives the desired event.
*/
static inline void qmp_eventwait(const char *event)
{
@@ -582,7 +582,7 @@ static inline void qmp_eventwait(const char *event)
* qmp_eventwait_ref:
* @s: #event event to wait for.
*
- * Continuosly polls for QMP responses until it receives the desired event.
+ * Continuously polls for QMP responses until it receives the desired event.
* Returns a copy of the event for further investigation.
*/
static inline QDict *qmp_eventwait_ref(const char *event)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 2a55ec9ada..d504b6e455 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -123,12 +123,6 @@ fi
# we need common
. "$source_iotests/common"
-#if [ `id -u` -ne 0 ]
-#then
-# echo "check: QA must be run as root"
-# exit 1
-#fi
-
TIMESTAMP_FILE=check.time-$IMGPROTO-$IMGFMT
tmp="${TEST_DIR}"/$$
@@ -228,10 +222,7 @@ rm -f check.full
[ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE
FULL_IMGFMT_DETAILS=`_full_imgfmt_details`
-FULL_IMGPROTO_DETAILS=`_full_imgproto_details`
FULL_HOST_DETAILS=`_full_platform_details`
-#FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
-#FULL_MOUNT_OPTIONS=`_scratch_mount_options`
cat <<EOF
QEMU -- "$QEMU_PROG" $QEMU_OPTIONS
@@ -239,14 +230,12 @@ QEMU_IMG -- "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS
QEMU_IO -- "$QEMU_IO_PROG" $QEMU_IO_OPTIONS
QEMU_NBD -- "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS
IMGFMT -- $FULL_IMGFMT_DETAILS
-IMGPROTO -- $FULL_IMGPROTO_DETAILS
+IMGPROTO -- $IMGPROTO
PLATFORM -- $FULL_HOST_DETAILS
TEST_DIR -- $TEST_DIR
SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER
EOF
-#MKFS_OPTIONS -- $FULL_MKFS_OPTIONS
-#MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
seq="check"
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index bfbc80e5f6..8d486dbeb4 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -482,11 +482,6 @@ _full_imgfmt_details()
fi
}
-_full_imgproto_details()
-{
- echo "$IMGPROTO"
-}
-
_full_platform_details()
{
os=`uname -s`