From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN1Xe-00048M-86 for qemu-devel@nongnu.org; Thu, 19 May 2011 07:37:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QN1Xc-0002qM-Dr for qemu-devel@nongnu.org; Thu, 19 May 2011 07:37:22 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:48508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN1Xc-0002pr-1W for qemu-devel@nongnu.org; Thu, 19 May 2011 07:37:20 -0400 Received: from blackfin.pond.sub.org (p5B32D5F1.dip.t-dialin.net [91.50.213.241]) by oxygen.pond.sub.org (Postfix) with ESMTPA id D26E82DD4A9 for ; Thu, 19 May 2011 13:37:17 +0200 (CEST) From: Markus Armbruster Date: Thu, 19 May 2011 13:37:17 +0200 Message-Id: <1305805037-17752-5-git-send-email-armbru@redhat.com> In-Reply-To: <1305805037-17752-1-git-send-email-armbru@redhat.com> References: <1305805037-17752-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] ide: Turn properties any IDE device must have into bus properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, alevy@redhat.com, kraxel@redhat.com Signed-off-by: Markus Armbruster --- hw/ide/qdev.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 2bb5c27..dcc4a3a 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -31,6 +31,10 @@ static struct BusInfo ide_bus_info = { .name = "IDE", .size = sizeof(IDEBus), .get_fw_dev_path = idebus_get_fw_dev_path, + .props = (Property[]) { + DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1), + DEFINE_PROP_END_OF_LIST(), + }, }; void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id) @@ -157,7 +161,6 @@ static IDEDeviceInfo ide_drive_info = { .qdev.size = sizeof(IDEDrive), .init = ide_drive_initfn, .qdev.props = (Property[]) { - DEFINE_PROP_UINT32("unit", IDEDrive, dev.unit, -1), DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf), DEFINE_PROP_STRING("ver", IDEDrive, dev.version), DEFINE_PROP_STRING("serial", IDEDrive, dev.serial), -- 1.7.2.3