From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBzLC-000857-KB for qemu-devel@nongnu.org; Sun, 25 Mar 2012 22:07:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBzLA-0000Se-LP for qemu-devel@nongnu.org; Sun, 25 Mar 2012 22:07:26 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:40243) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBzL7-0000RT-P9 for qemu-devel@nongnu.org; Sun, 25 Mar 2012 22:07:24 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 26 Mar 2012 02:02:47 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2Q20ogt3264762 for ; Mon, 26 Mar 2012 13:00:52 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2Q26pPM014930 for ; Mon, 26 Mar 2012 13:06:52 +1100 From: Wanpeng Li Date: Mon, 26 Mar 2012 10:06:42 +0800 Message-Id: <1332727608-26523-1-git-send-email-liwp@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Wanpeng Li , Anthony Liguori , Avi Kivity , Gavin Shan From: Anthony Liguori This series aggressively refactors the PC machine initialization to be more modelled and less ad-hoc. The highlights of this series are: 1) Things like -m and -bios-name are now device model properties 2) The i440fx and piix3 are now modelled in a thorough fashion 3) Most of the chipset features of the piix3 are modelled through composition 4) i440fx_init is trivialized to creating devices and setting properties 5) convert MemoryRegion to QOM 6) convert PCI host bridge to QOM The point (4) is the most important one. As we refactor in this fashion, we should quickly get to the point where machine->init disappears completely in favor of just creating a handful of devices. The two stage initialization of QOM is important here. instance_init() is when composed devices are created which means that after you've created a device, all of its children are visible in the device model. This lets you set properties of the parent and its children. realize() (which is still called DeviceState::init today) will be called right before the guest starts up for the first time. Signed-off-by: Anthony Liguori Signed-off-by: Wanpeng Li --- Makefile.target | 3 +- hw/hpet.c | 39 +--- hw/hpet_emul.h | 41 +++ hw/i440fx.c | 431 ++++++++++++++++++++++++++ hw/i440fx.h | 78 +++++ hw/i8254_internal.h | 2 +- hw/mc146818rtc.c | 26 -- hw/mc146818rtc.h | 29 ++ hw/pc.c | 838 +++++++++++++++++++++++++++++++++++++++++++++------ hw/pc.h | 46 +--- hw/pc_piix.c | 762 ---------------------------------------------- hw/pci_host.c | 26 ++ hw/pci_host.h | 5 + hw/piix3.c | 274 +++++++++++++++++ hw/piix3.h | 79 +++++ hw/piix_pci.c | 600 ------------------------------------ memory.c | 94 +++++-- memory.h | 8 + 18 files changed, 1795 insertions(+), 1586 deletions(-) create mode 100644 hw/i440fx.c create mode 100644 hw/i440fx.h delete mode 100644 hw/pc_piix.c create mode 100644 hw/piix3.c create mode 100644 hw/piix3.h delete mode 100644 hw/piix_pci.c --