From e19881eef9fed854432e0198b5befe1813e1a6c4 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Wed, 10 Jul 2013 11:57:27 +0900 Subject: [PATCH] Enhancement API for PCI hot-plugging. Change-Id: I3bd792abd1e5c01a1b5ac768339f4740a8009580 Signed-off-by: SeokYeon Hwang --- hw/pci/pci-hotplug.c | 7 ++++++- include/sysemu/sysemu.h | 6 +++--- tizen/src/mloop_event.c | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c index b53bee41d0..74aaa32cd8 100644 --- a/hw/pci/pci-hotplug.c +++ b/hw/pci/pci-hotplug.c @@ -252,7 +252,12 @@ static PCIDevice *qemu_pci_hot_add_keyboard(Monitor *mon, #endif /* CONFIG_MARU */ #ifdef CONFIG_MARU -PCIDevice *pci_device_hot_add(Monitor *mon, const QDict *qdict) +void pci_device_hot_add(Monitor *mon, const QDict *qdict) +{ + do_pci_device_hot_add(mon, qdict); +} + +PCIDevice *do_pci_device_hot_add(Monitor *mon, const QDict *qdict) #else void pci_device_hot_add(Monitor *mon, const QDict *qdict) #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index e928717d7f..c13fe4b8e5 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -156,10 +156,10 @@ extern unsigned int nb_prom_envs; /* pci-hotplug */ #ifdef CONFIG_MARU -PCIDevice *pci_device_hot_add(Monitor *mon, const QDict *qdict); -#else -void pci_device_hot_add(Monitor *mon, const QDict *qdict); +PCIDevice *do_pci_device_hot_add(Monitor *mon, const QDict *qdict); #endif +void pci_device_hot_add(Monitor *mon, const QDict *qdict); + int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo); void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict); diff --git a/tizen/src/mloop_event.c b/tizen/src/mloop_event.c index 2f858c7c24..ee0ada5c24 100644 --- a/tizen/src/mloop_event.c +++ b/tizen/src/mloop_event.c @@ -301,7 +301,7 @@ static void mloop_evhandle_kbd_add(char *name) qdict_put(qdict, "pci_addr", qstring_from_str("auto")); qdict_put(qdict, "type", qstring_from_str(name)); - hostkbd = pci_device_hot_add(cur_mon, qdict); + hostkbd = do_pci_device_hot_add(cur_mon, qdict); if (hostkbd) { INFO("hot_add keyboard device.\n"); TRACE("virtio-keyboard device: domain %d, bus %d, slot %d, function %d\n", @@ -366,7 +366,7 @@ static void mloop_evhandle_sdcard_attach(char *name) snprintf(opts, sizeof(opts), "file=%s,if=virtio", name); qdict_put(qdict, "opts", qstring_from_str(opts)); - virtio_sdcard = pci_device_hot_add(cur_mon, qdict); + virtio_sdcard = do_pci_device_hot_add(cur_mon, qdict); if (virtio_sdcard) { INFO("hot add virtio storage device with [%s]\n", opts); INFO("virtio-sdcard device: domain %d, bus %d, slot %d, function %d\n", -- 2.34.1