From c21e6f45cf3e64b11ddff58a0105d8b2c5db8fb0 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 15 Apr 2010 11:04:42 -0300 Subject: [PATCH 13/16] qdev: Convert qdev_unplug() to QError RH-Author: Markus Armbruster Message-id: <1271329483-13665-2-git-send-email-armbru@redhat.com> Patchwork-id: 8643 O-Subject: [RHEL-6 KVM PATCH 1/2] qdev: Convert qdev_unplug() to QError Bugzilla: 582325 RH-Acked-by: Luiz Capitulino RH-Acked-by: Juan Quintela RH-Acked-by: Kevin Wolf Note: our device unplug methods don't need conversion work, because they can't currently fail. Signed-off-by: Markus Armbruster --- hw/qdev.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) Signed-off-by: Eduardo Habkost --- hw/qdev.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index f45ed0f..c521115 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -287,8 +287,7 @@ int qdev_init(DeviceState *dev) int qdev_unplug(DeviceState *dev) { if (!dev->parent_bus->allow_hotplug) { - error_report("Bus %s does not support hotplugging", - dev->parent_bus->name); + qerror_report(QERR_BUS_NO_HOTPLUG, dev->parent_bus->name); return -1; } assert(dev->info->unplug != NULL); -- 1.7.0.3