From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: "Stefano Stabellini" <sstabellini@kernel.org>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Paul Durrant" <paul@xen.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
xen-devel@lists.xenproject.org,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v3 5/7] hw/xen: Make xen_shutdown_fatal_error() available out of X86 HVM
Date: Mon, 1 Feb 2021 12:29:03 +0100 [thread overview]
Message-ID: <20210201112905.545144-6-f4bug@amsat.org> (raw)
In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org>
xen_shutdown_fatal_error() is also used by XEN_PV.
This fixes when XEN_PV without XEN_FV:
/usr/bin/ld: libqemu-x86_64-softmmu.fa.p/hw_xen_xen_pt_config_init.c.o: in function `xen_pt_status_reg_init':
hw/xen/xen_pt_config_init.c:281: undefined reference to `xen_shutdown_fatal_error'
/usr/bin/ld: hw/xen/xen_pt_config_init.c:275: undefined reference to `xen_shutdown_fatal_error'
/usr/bin/ld: libqemu-x86_64-softmmu.fa.p/hw_xen_xen_pt.c.o: in function `xen_pt_pci_read_config':
hw/xen/xen_pt.c:220: undefined reference to `xen_shutdown_fatal_error'
/usr/bin/ld: libqemu-x86_64-softmmu.fa.p/hw_xen_xen_pt.c.o: in function `xen_pt_pci_write_config':
hw/xen/xen_pt.c:369: undefined reference to `xen_shutdown_fatal_error'
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/i386/xen/xen-hvm.c | 13 -------------
hw/xen/xen-utils.c | 25 +++++++++++++++++++++++++
hw/xen/meson.build | 1 +
3 files changed, 26 insertions(+), 13 deletions(-)
create mode 100644 hw/xen/xen-utils.c
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 7156ab13329..69196754a30 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -28,7 +28,6 @@
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/range.h"
-#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
#include "sysemu/xen.h"
#include "trace.h"
@@ -1570,18 +1569,6 @@ void xen_register_framebuffer(MemoryRegion *mr)
framebuffer = mr;
}
-void xen_shutdown_fatal_error(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- va_end(ap);
- fprintf(stderr, "Will destroy the domain.\n");
- /* destroy the domain */
- qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
-}
-
void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
{
if (unlikely(xen_in_migration)) {
diff --git a/hw/xen/xen-utils.c b/hw/xen/xen-utils.c
new file mode 100644
index 00000000000..d6003782420
--- /dev/null
+++ b/hw/xen/xen-utils.c
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2010 Citrix 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.
+ */
+
+#include "qemu/osdep.h"
+#include "sysemu/runstate.h"
+#include "hw/xen/xen_common.h"
+
+void xen_shutdown_fatal_error(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "Will destroy the domain.\n");
+ /* destroy the domain */
+ qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
+}
diff --git a/hw/xen/meson.build b/hw/xen/meson.build
index 3c2062b9b3e..6c836ae06e4 100644
--- a/hw/xen/meson.build
+++ b/hw/xen/meson.build
@@ -4,6 +4,7 @@
'xen-bus.c',
'xen_devconfig.c',
'xen_pvdev.c',
+ 'xen-utils.c',
))
xen_specific_ss = ss.source_set()
--
2.26.2
next prev parent reply other threads:[~2021-02-01 11:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 11:28 [PATCH v3 0/7] hw/xen: Introduce XEN_FV/XEN_PV Kconfig Philippe Mathieu-Daudé
2021-02-01 11:28 ` [PATCH v3 1/7] meson: Do not build Xen x86_64-softmmu on Aarch64 Philippe Mathieu-Daudé
2021-02-01 11:29 ` [PATCH v3 2/7] hw/xen: Relax dependency on FSDEV_9P Philippe Mathieu-Daudé
2021-02-01 11:29 ` [PATCH v3 3/7] accel/xen: Incorporate xen-mapcache.c Philippe Mathieu-Daudé
2021-02-01 13:08 ` Philippe Mathieu-Daudé
2021-02-01 11:29 ` [PATCH v3 4/7] hw/i386/xen: Introduce XEN_FV Kconfig Philippe Mathieu-Daudé
2021-02-01 11:29 ` Philippe Mathieu-Daudé [this message]
2021-02-01 13:09 ` [PATCH v3 5/7] hw/xen: Make xen_shutdown_fatal_error() available out of X86 HVM Philippe Mathieu-Daudé
2021-02-01 11:29 ` [PATCH v3 6/7] hw/xen: Make qmp_xen_set_global_dirty_log() " Philippe Mathieu-Daudé
2021-02-01 11:29 ` [PATCH v3 7/7] NOTFORMERGE hw/xen/Kconfig: Introduce XEN_PV config Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210201112905.545144-6-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alex.bennee@linaro.org \
--cc=anthony.perard@citrix.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).