trivial: Remove xenfb_enabled from sysemu.h
diff mbox series

Message ID 20200121161747.10569-1-thuth@redhat.com
State New
Headers show
Series
  • trivial: Remove xenfb_enabled from sysemu.h
Related show

Commit Message

Thomas Huth Jan. 21, 2020, 4:17 p.m. UTC
The define is only used in one other place. Move the code there
instead of keeping this xen-specific define in sysemu.h.

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(-)

Comments

Philippe Mathieu-Daudé Jan. 21, 2020, 4:41 p.m. UTC | #1
On 1/21/20 5:17 PM, Thomas Huth wrote:
> The define is only used in one other place. Move the code there
> instead of keeping this xen-specific define in sysemu.h.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@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 80c57fdc4e..2ccf216158 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;
>
Paul Durrant Jan. 21, 2020, 4:59 p.m. UTC | #2
On Tue, 21 Jan 2020 at 16:18, Thomas Huth <thuth@redhat.com> wrote:
>
> The define is only used in one other place. Move the code there
> instead of keeping this xen-specific define in sysemu.h.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Acked-by: Paul Durrant <paul@xen.org>

Patch
diff mbox series

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 80c57fdc4e..2ccf216158 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;