| Message ID | 1320332422-2457-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 11/03/2011 10:00 AM, Paolo Bonzini wrote: > sgabios hasn't gotten a lot of coverage since it was not shipped. For 1.0, > let's disable the automatic loading of the option ROM in -nographic > mode. We can put it back for 1.1. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> Applied. Thanks. Regards, Anthony Liguori > --- > Requested by Anthony on IRC. > > hw/pc.c | 9 --------- > 1 files changed, 0 insertions(+), 9 deletions(-) > > diff --git a/hw/pc.c b/hw/pc.c > index eb4c2d8..1024465 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -1104,15 +1104,6 @@ void pc_vga_init(PCIBus *pci_bus) > isa_vga_init(); > } > } > - > - /* > - * sga does not suppress normal vga output. So a machine can have both a > - * vga card and sga manually enabled. Output will be seen on both. > - * For nographic case, sga is enabled at all times > - */ > - if (display_type == DT_NOGRAPHIC) { > - isa_create_simple("sga"); > - } > } > > static void cpu_request_exit(void *opaque, int irq, int level)
On 11/08/2011 06:23 PM, Anthony Liguori wrote: > On 11/03/2011 10:00 AM, Paolo Bonzini wrote: >> sgabios hasn't gotten a lot of coverage since it was not shipped. For >> 1.0, >> let's disable the automatic loading of the option ROM in -nographic >> mode. We can put it back for 1.1. >> >> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> > > Applied. Thanks. Can you please revert it for 1.1? Thanks! Paolo >> --- >> Requested by Anthony on IRC. >> >> hw/pc.c | 9 --------- >> 1 files changed, 0 insertions(+), 9 deletions(-) >> >> diff --git a/hw/pc.c b/hw/pc.c >> index eb4c2d8..1024465 100644 >> --- a/hw/pc.c >> +++ b/hw/pc.c >> @@ -1104,15 +1104,6 @@ void pc_vga_init(PCIBus *pci_bus) >> isa_vga_init(); >> } >> } >> - >> - /* >> - * sga does not suppress normal vga output. So a machine can have both a >> - * vga card and sga manually enabled. Output will be seen on both. >> - * For nographic case, sga is enabled at all times >> - */ >> - if (display_type == DT_NOGRAPHIC) { >> - isa_create_simple("sga"); >> - } >> } >> >> static void cpu_request_exit(void *opaque, int irq, int level) > > >
On 12/02/2011 10:33 AM, Paolo Bonzini wrote: > On 11/08/2011 06:23 PM, Anthony Liguori wrote: >> On 11/03/2011 10:00 AM, Paolo Bonzini wrote: >>> sgabios hasn't gotten a lot of coverage since it was not shipped. For >>> 1.0, >>> let's disable the automatic loading of the option ROM in -nographic >>> mode. We can put it back for 1.1. >>> >>> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> >> >> Applied. Thanks. > > Can you please revert it for 1.1? Thanks! Can you send a patch? Regards, Anthony Liguori > > Paolo > >>> --- >>> Requested by Anthony on IRC. >>> >>> hw/pc.c | 9 --------- >>> 1 files changed, 0 insertions(+), 9 deletions(-) >>> >>> diff --git a/hw/pc.c b/hw/pc.c >>> index eb4c2d8..1024465 100644 >>> --- a/hw/pc.c >>> +++ b/hw/pc.c >>> @@ -1104,15 +1104,6 @@ void pc_vga_init(PCIBus *pci_bus) >>> isa_vga_init(); >>> } >>> } >>> - >>> - /* >>> - * sga does not suppress normal vga output. So a machine can have both a >>> - * vga card and sga manually enabled. Output will be seen on both. >>> - * For nographic case, sga is enabled at all times >>> - */ >>> - if (display_type == DT_NOGRAPHIC) { >>> - isa_create_simple("sga"); >>> - } >>> } >>> >>> static void cpu_request_exit(void *opaque, int irq, int level) >> >> >> >
diff --git a/hw/pc.c b/hw/pc.c index eb4c2d8..1024465 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1104,15 +1104,6 @@ void pc_vga_init(PCIBus *pci_bus) isa_vga_init(); } } - - /* - * sga does not suppress normal vga output. So a machine can have both a - * vga card and sga manually enabled. Output will be seen on both. - * For nographic case, sga is enabled at all times - */ - if (display_type == DT_NOGRAPHIC) { - isa_create_simple("sga"); - } } static void cpu_request_exit(void *opaque, int irq, int level)
sgabios hasn't gotten a lot of coverage since it was not shipped. For 1.0, let's disable the automatic loading of the option ROM in -nographic mode. We can put it back for 1.1. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- Requested by Anthony on IRC. hw/pc.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)