qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL 13/13] trivial: Remove xenfb_enabled from sysemu.h
Date: Mon,  3 Feb 2020 13:38:11 +0100	[thread overview]
Message-ID: <20200203123811.8651-14-thuth@redhat.com> (raw)
In-Reply-To: <20200203123811.8651-1-thuth@redhat.com>

The define is only used in one other place. Move the code there
instead of keeping this xen-specific define in sysemu.h.

Message-Id: <20200121161747.10569-1-thuth@redhat.com>
Acked-by: Paul Durrant <paul@xen.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/xenpv/xen_machine_pv.c | 2 +-
 include/sysemu/sysemu.h   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 3a8af1a1e0..8df575a457 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -60,7 +60,7 @@ static void xen_init_pv(MachineState *machine)
     xen_be_register("qnic", &xen_netdev_ops);
 
     /* configure framebuffer */
-    if (xenfb_enabled) {
+    if (vga_interface_type == VGA_XENFB) {
         xen_config_dev_vfb(0, "vnc");
         xen_config_dev_vkbd(0);
     }
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 686f4217a6..6358a324a7 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -32,7 +32,6 @@ typedef enum {
 } VGAInterfaceType;
 
 extern int vga_interface_type;
-#define xenfb_enabled (vga_interface_type == VGA_XENFB)
 
 extern int graphic_width;
 extern int graphic_height;
-- 
2.18.1



  parent reply	other threads:[~2020-02-03 12:42 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-03 12:37 [PULL 00/13] qtests, kconfig and misc patches Thomas Huth
2020-02-03 12:37 ` [PULL 01/13] test-logging: Fix -Werror=maybe-uninitialized warning Thomas Huth
2020-02-03 12:38 ` [PULL 02/13] tests/vhost-user-bridge: Fix build Thomas Huth
2020-02-03 12:38 ` [PULL 03/13] docs/devel: Fix qtest paths and info about check-block in testing.rst Thomas Huth
2020-02-03 12:38 ` [PULL 04/13] tests/Makefile: Fix inclusion of the qos dependency files Thomas Huth
2020-02-03 12:38 ` [PULL 05/13] boot-order-test: fix memleaks in boot-order-test Thomas Huth
2020-02-03 12:38 ` [PULL 06/13] tests/qtest: update comments about bios-tables-test-allowed-diff.h Thomas Huth
2020-02-03 12:38 ` [PULL 07/13] gitlab-ci: Refresh the list of iotests Thomas Huth
2020-02-03 12:38 ` [PULL 08/13] hw/bt: Remove empty Kconfig file Thomas Huth
2020-02-03 12:38 ` [PULL 09/13] hw/input: Do not enable CONFIG_PCKBD by default Thomas Huth
2020-02-03 12:38 ` [PULL 10/13] hw/hppa/Kconfig: LASI chipset requires PARALLEL port Thomas Huth
2020-02-03 12:38 ` [PULL 11/13] hw/*/Makefile.objs: Move many .o files to common-objs Thomas Huth
2020-02-03 12:38 ` [PULL 12/13] include/sysemu/sysemu.h: Remove usused variable no_quit Thomas Huth
2020-02-03 12:38 ` Thomas Huth [this message]
2020-02-03 14:04 ` [PULL 00/13] qtests, kconfig and misc patches Peter Maydell
2020-02-03 14:30   ` Thomas Huth
2020-02-03 14:43     ` Thomas Huth
2020-02-03 14:50     ` Peter Maydell
2020-02-03 14:57       ` Thomas Huth
2020-02-03 15:02         ` Thomas Huth
2020-02-03 15:17       ` Paolo Bonzini
2020-02-03 15:29         ` Paolo Bonzini
2020-02-03 15:38           ` Thomas Huth
2020-02-03 15:35       ` Daniel P. Berrangé

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=20200203123811.8651-14-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.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).