From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNJMM-0004yM-CZ for qemu-devel@nongnu.org; Tue, 11 Mar 2014 05:52:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNJMC-0006px-Qj for qemu-devel@nongnu.org; Tue, 11 Mar 2014 05:52:30 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:38847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNJMC-0006pL-7n for qemu-devel@nongnu.org; Tue, 11 Mar 2014 05:52:20 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Mar 2014 15:22:16 +0530 Message-ID: <531EDCC8.6090906@linux.vnet.ibm.com> Date: Tue, 11 Mar 2014 17:52:08 +0800 From: Mark Wu MIME-Version: 1.0 References: <1394462261-25581-1-git-send-email-wudxw@linux.vnet.ibm.com> <1394462261-25581-2-git-send-email-wudxw@linux.vnet.ibm.com> <531DD196.5020906@redhat.com> In-Reply-To: <531DD196.5020906@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 2/2] Fix return value of vga initlization on ppc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: aliguori@amazon.com, agraf@suse.de, nikunj@linux.vnet.ibm.com, afaerber@suse.de On 03/10/2014 10:52 PM, Paolo Bonzini wrote: > Il 10/03/2014 15:37, Mark Wu ha scritto: >> Before spapr_vga_init will returned false if the vga is specified by >> the command '-device VGA' because vga_interface_type was evaluated to >> VGA_NONE. With the change in previous patch of this series, >> spapr_vga_init should return true if it's told that the vga will be >> initialized in flow of the generic devices initialization. >> >> To keep '-nodefaults' have the semantics of bare minimum, it adds a >> check of 'has_defaults' in usb_enabled() to avoid that a USB controller >> is added by '-nodefautls, -device VGA' implicitly. >> >> This patch also makes two cleanups: >> 1. skip initialization for VGA_NONE >> 2. remove the useless 'break' >> >> Signed-off-by: Mark Wu >> --- >> hw/ppc/spapr.c | 4 +++- >> vl.c | 3 ++- >> 2 files changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index bf46c38..5c9a154 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -781,13 +781,15 @@ static int spapr_vga_init(PCIBus *pci_bus) >> { >> switch (vga_interface_type) { >> case VGA_NONE: >> + return false; >> + case VGA_DEVICE: >> + return true; >> case VGA_STD: >> return pci_vga_init(pci_bus) != NULL; >> default: >> fprintf(stderr, "This vga model is not supported," >> "currently it only supports -vga std\n"); >> exit(0); >> - break; >> } >> } >> >> diff --git a/vl.c b/vl.c >> index f8f7c00..e9d8baf 100644 >> --- a/vl.c >> +++ b/vl.c >> @@ -932,7 +932,8 @@ static int parse_sandbox(QemuOpts *opts, void >> *opaque) >> >> bool usb_enabled(bool default_usb) >> { >> - return qemu_opt_get_bool(qemu_get_machine_opts(), "usb", >> default_usb); >> + return qemu_opt_get_bool(qemu_get_machine_opts(), "usb", >> + has_defaults && default_usb); >> } >> >> #ifndef _WIN32 >> > > Reviewed-by: Paolo Bonzini > Thanks a lot for the review. You contributed a lot on this patch, but I forgot to acknowledge it in commit message. I think re-sending a new patch to include it could cause some noise. May I ask the maintainer add the following line in the commit message when it's picked? Same on 1/2 in this series Thanks. Suggested-by: Paolo Bonzini