From 36b7f27d2195a09dbfb7f08b2323d807c1ad90b0 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 8 Sep 2012 16:01:20 +0200 Subject: [PATCH] vl.c: convert *vga_enabled functions to QOM And get rid of qdev_exists(). Signed-off-by: Aurelien Jarno --- hw/qdev.c | 5 ----- hw/qdev.h | 1 - vl.c | 7 ++++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 3b5ce3312..adfc4a7ea 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -52,11 +52,6 @@ const char *qdev_fw_name(DeviceState *dev) return object_get_typename(OBJECT(dev)); } -bool qdev_exists(const char *name) -{ - return !!object_class_by_name(name); -} - static void qdev_property_add_legacy(DeviceState *dev, Property *prop, Error **errp); diff --git a/hw/qdev.h b/hw/qdev.h index d69919441..c6ac63620 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -153,7 +153,6 @@ typedef struct GlobalProperty { DeviceState *qdev_create(BusState *bus, const char *name); DeviceState *qdev_try_create(BusState *bus, const char *name); -bool qdev_exists(const char *name); int qdev_device_help(QemuOpts *opts); DeviceState *qdev_device_add(QemuOpts *opts); int qdev_init(DeviceState *dev) QEMU_WARN_UNUSED_RESULT; diff --git a/vl.c b/vl.c index 8d305ca59..bf9cdf8eb 100644 --- a/vl.c +++ b/vl.c @@ -1700,17 +1700,18 @@ static const QEMUOption qemu_options[] = { static bool vga_available(void) { - return qdev_exists("VGA") || qdev_exists("isa-vga"); + return object_class_by_name("VGA") || object_class_by_name("isa-vga"); } static bool cirrus_vga_available(void) { - return qdev_exists("cirrus-vga") || qdev_exists("isa-cirrus-vga"); + return object_class_by_name("cirrus-vga") + || object_class_by_name("isa-cirrus-vga"); } static bool vmware_vga_available(void) { - return qdev_exists("vmware-svga"); + return object_class_by_name("vmware-svga"); } static void select_vgahw (const char *p) -- 2.39.2