From 71f364b703119a319e6ac423c9446849d010abf3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Date: Tue, 8 Sep 2020 17:55:28 +0200
Subject: [PATCH] stubs: Split accelerator / hardware related stubs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Move hardware stubs unrelated from the accelerator to xen-hw-stub.c.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200908155530.249806-5-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 MAINTAINERS                                   |  1 +
 accel/stubs/xen-stub.c                        | 71 ++++++---------------------
 stubs/meson.build                             |  1 +
 accel/stubs/xen-stub.c => stubs/xen-hw-stub.c |  8 +--
 4 files changed, 19 insertions(+), 62 deletions(-)
 rewrite accel/stubs/xen-stub.c (65%)
 copy accel/stubs/xen-stub.c => stubs/xen-hw-stub.c (87%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2c8366d3a5..ffcf222243 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -480,6 +480,7 @@ F: include/hw/block/dataplane/xen*
 F: include/hw/xen/
 F: include/sysemu/xen.h
 F: include/sysemu/xen-mapcache.h
+F: stubs/xen-hw-stub.c
 
 Guest CPU Cores (HAXM)
 ---------------------
diff --git a/accel/stubs/xen-stub.c b/accel/stubs/xen-stub.c
dissimilarity index 65%
index fa3dddbce5..7ba0b697f4 100644
--- a/accel/stubs/xen-stub.c
+++ b/accel/stubs/xen-stub.c
@@ -1,55 +1,16 @@
-/*
- * Copyright (C) 2014       Citrix Systems UK Ltd.
- *
- * 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 "qemu/osdep.h"
-#include "hw/xen/xen.h"
-#include "qapi/qapi-commands-misc.h"
-
-bool xen_allowed;
-
-void xenstore_store_pv_console_info(int i, Chardev *chr)
-{
-}
-
-int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
-{
-    return -1;
-}
-
-void xen_piix3_set_irq(void *opaque, int irq_num, int level)
-{
-}
-
-void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len)
-{
-}
-
-void xen_hvm_inject_msi(uint64_t addr, uint32_t data)
-{
-}
-
-int xen_is_pirq_msi(uint32_t msi_data)
-{
-    return 0;
-}
-
-qemu_irq *xen_interrupt_controller_init(void)
-{
-    return NULL;
-}
-
-void xen_register_framebuffer(MemoryRegion *mr)
-{
-}
-
-void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
-{
-}
-
-void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
-{
-}
+/*
+ * Copyright (C) 2014       Citrix Systems UK Ltd.
+ *
+ * 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 "qemu/osdep.h"
+#include "sysemu/xen.h"
+#include "qapi/qapi-commands-misc.h"
+
+bool xen_allowed;
+
+void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
+{
+}
diff --git a/stubs/meson.build b/stubs/meson.build
index e0b322bc28..5730f1d967 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -46,4 +46,5 @@ stub_ss.add(files('vm-stop.c'))
 stub_ss.add(files('win32-kbd-hook.c'))
 if have_system
   stub_ss.add(files('semihost.c'))
+  stub_ss.add(files('xen-hw-stub.c'))
 endif
diff --git a/accel/stubs/xen-stub.c b/stubs/xen-hw-stub.c
similarity index 87%
copy from accel/stubs/xen-stub.c
copy to stubs/xen-hw-stub.c
index fa3dddbce5..d14efef49e 100644
--- a/accel/stubs/xen-stub.c
+++ b/stubs/xen-hw-stub.c
@@ -1,15 +1,13 @@
 /*
  * Copyright (C) 2014       Citrix Systems UK Ltd.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  * 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 "qemu/osdep.h"
 #include "hw/xen/xen.h"
-#include "qapi/qapi-commands-misc.h"
-
-bool xen_allowed;
 
 void xenstore_store_pv_console_info(int i, Chardev *chr)
 {
@@ -49,7 +47,3 @@ void xen_register_framebuffer(MemoryRegion *mr)
 void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
 {
 }
-
-void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
-{
-}
-- 
2.11.4.GIT