| Message ID | 20110801110028.GL31494@valinux.co.jp |
|---|---|
| State | New |
| Headers | show |
Am 01.08.2011 13:00, schrieb Isaku Yamahata: > > Hi, here is the patch. Can you please give it a try? > > From 41039df3174fa46477c4faf93d13eab360dccc22 Mon Sep 17 00:00:00 2001 > Message-Id: > <41039df3174fa46477c4faf93d13eab360dccc22.1312196365.git.yamahata@valinux.co.jp> > From: Isaku Yamahata <yamahata@valinux.co.jp> > Date: Mon, 1 Aug 2011 19:56:42 +0900 > Subject: [PATCH] qdev: Fix duplicate reset > > qbus_reset_all_fn was registered twice, so a lot of device reset > functions were also called twice when QEMU started. > Which was introduced by 80376c3fc2c38fdd45354e4b0eb45031f35587ed > This patch fixes it by making the main_sytem_bus creation not register main_system_bus > reset handler. > > Cc: Stefan Weil <weil@mail.berlios.de> > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> > --- > hw/qdev.c | 14 ++++++++++++-- > 1 files changed, 12 insertions(+), 2 deletions(-) Thanks. I tested your patch with i386-softmmu (bios only) and with mipsel-softmmu (debian boot / malta). All registered reset functions were called only once, and qbus_reset_all_fn was the last one called. I noticed that there are two functions named piix3_reset. One might be renamed to piix3_ide_reset, but this is not related to your patch. There are also two functions piix4_reset. Tested-by: Stefan Weil <weil@mail.berlios.de>
diff --git a/hw/qdev.c b/hw/qdev.c index b4ea8e1..6819537 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -36,6 +36,7 @@ static bool qdev_hot_removed = false; /* This is a nasty hack to allow passing a NULL bus to qdev_create. */ static BusState *main_system_bus; +static void main_system_bus_create(void); DeviceInfo *device_info_list; @@ -328,8 +329,7 @@ static int qdev_reset_one(DeviceState *dev, void *opaque) BusState *sysbus_get_default(void) { if (!main_system_bus) { - main_system_bus = qbus_create(&system_bus_info, NULL, - "main-system-bus"); + main_system_bus_create(); } return main_system_bus; } @@ -784,6 +784,16 @@ BusState *qbus_create(BusInfo *info, DeviceState *parent, const char *name) return bus; } +static void main_system_bus_create(void) +{ + /* assign main_system_bus before qbus_create_inplace() + * in order to make "if (bus != main_system_bus)" work */ + main_system_bus = qemu_mallocz(system_bus_info.size); + main_system_bus->qdev_allocated = 1; + qbus_create_inplace(main_system_bus, &system_bus_info, NULL, + "main-system-bus"); +} + void qbus_free(BusState *bus) { DeviceState *dev;