[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 114/115] stubs: move Xen stubs to accel/
From: |
Paolo Bonzini |
Subject: |
[PULL 114/115] stubs: move Xen stubs to accel/ |
Date: |
Thu, 11 Jun 2020 15:44:48 -0400 |
Keep them close to the other accelerator-dependent stubs, so as to remove
stubs that are not needed by tools.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
accel/stubs/Makefile.objs | 1 +
stubs/xen-hvm.c => accel/stubs/xen-stub.c | 14 +++++++-------
stubs/Makefile.objs | 2 --
stubs/xen-common.c | 13 -------------
4 files changed, 8 insertions(+), 22 deletions(-)
rename stubs/xen-hvm.c => accel/stubs/xen-stub.c (74%)
delete mode 100644 stubs/xen-common.c
diff --git a/accel/stubs/Makefile.objs b/accel/stubs/Makefile.objs
index 3894caf95d..bbd14e71fb 100644
--- a/accel/stubs/Makefile.objs
+++ b/accel/stubs/Makefile.objs
@@ -3,3 +3,4 @@ obj-$(call lnot,$(CONFIG_HVF)) += hvf-stub.o
obj-$(call lnot,$(CONFIG_WHPX)) += whpx-stub.o
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o
+obj-$(call lnot,$(CONFIG_XEN)) += xen-stub.o
diff --git a/stubs/xen-hvm.c b/accel/stubs/xen-stub.c
similarity index 74%
rename from stubs/xen-hvm.c
rename to accel/stubs/xen-stub.c
index 6954a5b696..dcca4e678a 100644
--- a/stubs/xen-hvm.c
+++ b/accel/stubs/xen-stub.c
@@ -1,18 +1,18 @@
/*
- * Copyright (C) 2010 Citrix Ltd.
+ * Copyright (C) 2014 Citrix Systems UK Ltd.
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
- *
- * Contributions after 2012-01-13 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
+ * 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 "exec/memory.h"
#include "qapi/qapi-commands-misc.h"
+void xenstore_store_pv_console_info(int i, Chardev *chr)
+{
+}
+
int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
{
return -1;
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index c1e43ac68f..28e48171d1 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -49,7 +49,5 @@ stub-obj-y += target-get-monitor-def.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += uuid.o
stub-obj-y += vm-stop.o
-stub-obj-y += xen-common.o
-stub-obj-y += xen-hvm.o
endif # CONFIG_SOFTMMU || CONFIG_TOOLS
diff --git a/stubs/xen-common.c b/stubs/xen-common.c
deleted file mode 100644
index f5efcae362..0000000000
--- a/stubs/xen-common.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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"
-
-void xenstore_store_pv_console_info(int i, Chardev *chr)
-{
-}
--
2.26.2
- [PULL 058/115] disas: Let disas::read_memory() handler return EIO on error, (continued)
- [PULL 058/115] disas: Let disas::read_memory() handler return EIO on error, Paolo Bonzini, 2020/06/11
- [PULL 104/115] target/i386: sev: Partial cleanup to sev_state global, Paolo Bonzini, 2020/06/11
- [PULL 105/115] target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields, Paolo Bonzini, 2020/06/11
- [PULL 073/115] replay: implement fair mutex, Paolo Bonzini, 2020/06/11
- [PULL 103/115] target/i386: sev: Embed SEVState in SevGuestState, Paolo Bonzini, 2020/06/11
- [PULL 107/115] target/i386: sev: Remove redundant handle field, Paolo Bonzini, 2020/06/11
- [PULL 108/115] target/i386: sev: Unify SEVState and SevGuestState, Paolo Bonzini, 2020/06/11
- [PULL 109/115] checkpatch: reversed logic with acpi test checks, Paolo Bonzini, 2020/06/11
- [PULL 099/115] xen: fix build without pci passthrough, Paolo Bonzini, 2020/06/11
- [PULL 110/115] exec/memory: Remove unused MemoryRegionMmio type, Paolo Bonzini, 2020/06/11
- [PULL 114/115] stubs: move Xen stubs to accel/,
Paolo Bonzini <=
- [PULL 111/115] hw/usb: Move device-specific declarations to new 'hcd-musb.h' header, Paolo Bonzini, 2020/06/11
- [PULL 113/115] replay: fix replay shutdown for console mode, Paolo Bonzini, 2020/06/11
- [PULL 112/115] exec/cpu-common: Move MUSB specific typedefs to 'hw/usb/hcd-musb.h', Paolo Bonzini, 2020/06/11
- [PULL 115/115] target/i386: Remove obsolete TODO file, Paolo Bonzini, 2020/06/11
- [PULL 086/115] target/ppc: Restrict PPCVirtualHypervisorClass to system-mode, Paolo Bonzini, 2020/06/11
- [PULL 106/115] target/i386: sev: Remove redundant policy field, Paolo Bonzini, 2020/06/11
- Re: [PULL 000/115] Huge miscellaneous pull request for 2020-06-11, no-reply, 2020/06/11
- Re: [PULL 000/115] Huge miscellaneous pull request for 2020-06-11, Peter Maydell, 2020/06/12