From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbPj5-0003wN-U4 for qemu-devel@nongnu.org; Tue, 07 Oct 2014 04:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XbPie-0005TE-Kw for qemu-devel@nongnu.org; Tue, 07 Oct 2014 04:02:31 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:31577) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbPib-0005Eu-JG for qemu-devel@nongnu.org; Tue, 07 Oct 2014 04:02:04 -0400 From: Date: Tue, 7 Oct 2014 16:00:20 +0800 Message-ID: <1412668838-8656-17-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1412668838-8656-1-git-send-email-arei.gonglei@huawei.com> References: <1412668838-8656-1-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v11 16/34] usb-net: add bootindex to qom property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, weidong.huang@huawei.com, mst@redhat.com, aik@ozlabs.ru, armbru@redhat.com, kraxel@redhat.com, dmitry@daynix.com, akong@redhat.com, agraf@suse.de, Gonglei , lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, somlo@cmu.edu, luonengjun@huawei.com, peter.huangpeng@huawei.com, alex.williamson@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, rth@twiddle.net, kwolf@redhat.com, peter.crosthwaite@xilinx.com, chenliang88@huawei.com, imammedo@redhat.com, afaerber@suse.de From: Gonglei Add a qom property with the same name 'bootindex', when we remove it form qdev property, things will continue to work just fine, and we can use qom features which are not supported by qdev property. Signed-off-by: Gonglei Reviewed-by: Gerd Hoffmann --- hw/usb/dev-network.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 23e3c45..f341b33 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1375,6 +1375,16 @@ static void usb_net_realize(USBDevice *dev, Error **errrp) add_boot_device_path(s->conf.bootindex, &dev->qdev, "/ethernet@0"); } +static void usb_net_instance_init(Object *obj) +{ + USBDevice *dev = USB_DEVICE(obj); + USBNetState *s = DO_UPCAST(USBNetState, dev, dev); + + device_add_bootindex_property(obj, &s->conf.bootindex, + "bootindex", "/ethernet-phy@0", + &dev->qdev, NULL); +} + static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) { Error *local_err = NULL; @@ -1438,6 +1448,7 @@ static const TypeInfo net_info = { .parent = TYPE_USB_DEVICE, .instance_size = sizeof(USBNetState), .class_init = usb_net_class_initfn, + .instance_init = usb_net_instance_init, }; static void usb_net_register_types(void) -- 1.7.12.4