Skip to contentSkip to conversation

trivial: Remove xenfb_enabled from sysemu.h

PATCH In review Thomas Huth 3 participants 3 messages Jan 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trivial: Remove xenfb_enabled from sysemu.h

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

---
 hw/xenpv/xen_machine_pv.c | 2 +-
 include/sysemu/sysemu.h   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
hw/xenpv/xen_machine_pv.c +1 -1
index 3a8af1a1e0..8df575a457 100644
@@ -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);
     }
include/sysemu/sysemu.h +0 -1
index 80c57fdc4e..2ccf216158 100644
@@ -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;
Signature · 1 line
2.18.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Thomas Huth

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

Quoted 31 lines
---
  hw/xenpv/xen_machine_pv.c | 2 +-
  include/sysemu/sysemu.h   | 1 -
  2 files changed, 1 insertion(+), 2 deletions(-)
hw/xenpv/xen_machine_pv.c +1 -1
index 3a8af1a1e0..8df575a457 100644
@@ -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);
      }
include/sysemu/sysemu.h +0 -1
index 80c57fdc4e..2ccf216158 100644
@@ -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;