Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

[qemu.git] / hw / pci / pci-stub.c

diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index 1dda89b593873739694fbc4a495c74a53c62130d..36d2c430c5be25afc13ac220370197103b5dae04 100644 (file)
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -18,30 +18,20 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 

+#include "qemu/osdep.h"

 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"

+#include "qapi/qmp/qerror.h"

 #include "hw/pci/pci.h"
 #include "qmp-commands.h"
 
 PciInfoList *qmp_query_pci(Error **errp)
 {
 #include "hw/pci/pci.h"
 #include "qmp-commands.h"
 
 PciInfoList *qmp_query_pci(Error **errp)
 {

-    error_set(errp, QERR_UNSUPPORTED);
+    error_setg(errp, QERR_UNSUPPORTED);

     return NULL;
 }
 
     return NULL;
 }
 

-static void pci_error_message(Monitor *mon)
+void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict)

 {
     monitor_printf(mon, "PCI devices not supported\n");
 }
 {
     monitor_printf(mon, "PCI devices not supported\n");
 }

-
-int do_pcie_aer_inject_error(Monitor *mon,
-                             const QDict *qdict, QObject **ret_data)
-{
-    pci_error_message(mon);
-    return -ENOSYS;
-}
-
-void pcie_aer_inject_error_print(Monitor *mon, const QObject *data)
-{
-    pci_error_message(mon);
-}