[Qemu-devel] [PATCH 4/4] sga: fix copypasta

[Qemu-devel] [PATCH 4/4] sga: fix copypasta

[Blue Swirl]

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 hw/sga.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/sga.c b/hw/sga.c
index 7ef750a..ea11937 100644
--- a/hw/sga.c
+++ b/hw/sga.c
@@ -35,7 +35,7 @@ typedef struct ISAGAState {
     ISADevice dev;
 } ISASGAState;

-static int isa_cirrus_vga_initfn(ISADevice *dev)
+static int sga_initfn(ISADevice *dev)
 {
     rom_add_vga(SGABIOS_FILENAME);
     return 0;
@@ -45,7 +45,7 @@ static ISADeviceInfo sga_info = {
     .qdev.name    = "sga",
     .qdev.desc    = "Serial Graphics Adapter",
     .qdev.size    = sizeof(ISASGAState),
-    .init         = isa_cirrus_vga_initfn,
+    .init         = sga_initfn,
 };

 static void sga_register(void)
-- 
1.7.9.rc0

[-- Attachment #2: 0004-sga-fix-copypasta.patch --]
[-- Type: text/x-diff, Size: 1208 bytes --]

From 5a5ed33f1a4abeef7999ac2a08bd2f82f108de69 Mon Sep 17 00:00:00 2001
Message-Id: <5a5ed33f1a4abeef7999ac2a08bd2f82f108de69.1326056648.git.blauwirbel@gmail.com>
In-Reply-To: <44deac8ff21ed0b05757a03f3b558db7c71e29ab.1326056648.git.blauwirbel@gmail.com>
References: <44deac8ff21ed0b05757a03f3b558db7c71e29ab.1326056648.git.blauwirbel@gmail.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 23 Oct 2011 14:39:46 +0000
Subject: [PATCH 4/4] sga: fix copypasta

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 hw/sga.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/sga.c b/hw/sga.c
index 7ef750a..ea11937 100644
--- a/hw/sga.c
+++ b/hw/sga.c
@@ -35,7 +35,7 @@ typedef struct ISAGAState {
     ISADevice dev;
 } ISASGAState;
 
-static int isa_cirrus_vga_initfn(ISADevice *dev)
+static int sga_initfn(ISADevice *dev)
 {
     rom_add_vga(SGABIOS_FILENAME);
     return 0;
@@ -45,7 +45,7 @@ static ISADeviceInfo sga_info = {
     .qdev.name    = "sga",
     .qdev.desc    = "Serial Graphics Adapter",
     .qdev.size    = sizeof(ISASGAState),
-    .init         = isa_cirrus_vga_initfn,
+    .init         = sga_initfn,
 };
 
 static void sga_register(void)
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH 4/4] sga: fix copypasta

[Andreas Färber]

Add "Fix the name of the init function."?

Am 08.01.2012 22:11, schrieb Blue Swirl:
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

Reviewed-by: Andreas Färber <afaerber@suse.de>

This seems independent of the other VGA patches and probably should go
in early for Anthony to rebase his second QOM series onto?

Andreas

> ---
>  hw/sga.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/sga.c b/hw/sga.c
> index 7ef750a..ea11937 100644
> --- a/hw/sga.c
> +++ b/hw/sga.c
> @@ -35,7 +35,7 @@ typedef struct ISAGAState {
>      ISADevice dev;
>  } ISASGAState;
> 
> -static int isa_cirrus_vga_initfn(ISADevice *dev)
> +static int sga_initfn(ISADevice *dev)
>  {
>      rom_add_vga(SGABIOS_FILENAME);
>      return 0;
> @@ -45,7 +45,7 @@ static ISADeviceInfo sga_info = {
>      .qdev.name    = "sga",
>      .qdev.desc    = "Serial Graphics Adapter",
>      .qdev.size    = sizeof(ISASGAState),
> -    .init         = isa_cirrus_vga_initfn,
> +    .init         = sga_initfn,
>  };
> 
>  static void sga_register(void)

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg