From cc7a73604a4d6241ba2df37ea06109b4d7e03d4b Mon Sep 17 00:00:00 2001
From: Paolo Bonzini
Date: Mon, 24 Oct 2016 10:18:16 +0200
Subject: stubs: move smbios stubs to hw/smbios

No need to include them in libqemustub.a, since only system emulators
need them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/smbios/Makefile.objs         | 11 ++++++++---
 hw/smbios/smbios_type_38-stub.c | 14 ++++++++++++++
 stubs/Makefile.objs             |  1 -
 stubs/smbios_type_38.c          | 14 --------------
 4 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 hw/smbios/smbios_type_38-stub.c
 delete mode 100644 stubs/smbios_type_38.c

diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs
index ee0712bae0..23bb2bac07 100644
--- a/hw/smbios/Makefile.objs
+++ b/hw/smbios/Makefile.objs
@@ -1,5 +1,10 @@
-common-obj-$(CONFIG_SMBIOS) += smbios.o
-common-obj-$(call land,$(CONFIG_SMBIOS),$(CONFIG_IPMI)) += smbios_type_38.o
+ifeq ($(CONFIG_SMBIOS),y)
+common-obj-y += smbios.o
+common-obj-$(CONFIG_IPMI) += smbios_type_38.o
+common-obj-$(call lnot,$(CONFIG_IPMI)) += smbios_type_38-stub.o
+else
+common-obj-y += smbios-stub.o
+endif
 
-common-obj-$(call lnot,$(CONFIG_SMBIOS)) += smbios-stub.o
 common-obj-$(CONFIG_ALL) += smbios-stub.o
+common-obj-$(CONFIG_ALL) += smbios_type_38-stub.o
diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stub.c
new file mode 100644
index 0000000000..9528c2c28e
--- /dev/null
+++ b/hw/smbios/smbios_type_38-stub.c
@@ -0,0 +1,14 @@
+/*
+ * IPMI SMBIOS firmware handling
+ *
+ * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "hw/smbios/ipmi.h"
+
+void smbios_build_type_38_table(void)
+{
+}
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 9fc373ed3f..13c5d45ce3 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -44,7 +44,6 @@ stub-obj-y += target-monitor-defs.o
 stub-obj-y += target-get-monitor-def.o
 stub-obj-y += vhost.o
 stub-obj-y += iohandler.o
-stub-obj-y += smbios_type_38.o
 stub-obj-y += ipmi.o
 stub-obj-y += pc_madt_cpu_entry.o
 stub-obj-y += migration-colo.o
diff --git a/stubs/smbios_type_38.c b/stubs/smbios_type_38.c
deleted file mode 100644
index 9528c2c28e..0000000000
--- a/stubs/smbios_type_38.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * IPMI SMBIOS firmware handling
- *
- * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "hw/smbios/ipmi.h"
-
-void smbios_build_type_38_table(void)
-{
-}
-- 
cgit v1.2.3-55-g7522