From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVl1G-0005u3-HV for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:01:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVl1A-0001RV-Fh for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:01:38 -0400 Message-ID: <533D93EA.7000305@suse.de> Date: Thu, 03 Apr 2014 19:01:30 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1396544174-8904-1-git-send-email-nikunj@linux.vnet.ibm.com> In-Reply-To: <1396544174-8904-1-git-send-email-nikunj@linux.vnet.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] spapr: skip adding usb keyboard/mouse in case of -nodefaults List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikunj A Dadhania , qemu-devel@nongnu.org Cc: aik@au1.ibm.com, Mark Wu , qemu-ppc@nongnu.org, Alexander Graf , Paolo Bonzini Am 03.04.2014 18:56, schrieb Nikunj A Dadhania: > The following commit caused the regression in qemu-system-ppc64 >=20 > 7effdaa3: spapr: Fix return value of vga initialization > d44229c5: Fix vga_interface_type for command line argument '-device VGA= ' >=20 > Even when -nodefaults was provided, USB Keyboard and Mouse was added > to the machine. This breaks libvirt which uses -nodefaults and adds > the keyboard and mouse separately. The machine got 2 USB Keyboards > and 2 USB Mouses. >=20 > CC: Paolo Bonzini > CC: Mark Wu > CC: Andreas F=C3=A4rber > Signed-off-by: Nikunj A Dadhania > --- > hw/ppc/spapr.c | 6 +++++- > include/sysemu/sysemu.h | 1 + > vl.c | 10 ++++++++-- > 3 files changed, 14 insertions(+), 3 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index a11e121..3095626 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1328,7 +1328,11 @@ static void ppc_spapr_init(QEMUMachineInitArgs *= args) > =20 > if (usb_enabled(spapr->has_graphics)) { > pci_create_simple(phb->bus, -1, "pci-ohci"); > - if (spapr->has_graphics) { > + /* > + * For VGA/VNC, by default add usb keyboard/mouse, if -nodefau= lts > + * provided skip adding usb keyboard/mouse > + */ > + if (spapr->has_graphics && qemu_has_defaults()) { > usbdevice_create("keyboard"); > usbdevice_create("mouse"); > } > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index ba5c7f8..8e90ad0 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -200,6 +200,7 @@ DeviceState *get_boot_device(uint32_t position); > QemuOpts *qemu_get_machine_opts(void); > =20 > bool usb_enabled(bool default_usb); > +bool qemu_has_defaults(void); > =20 > extern QemuOptsList qemu_legacy_drive_opts; > extern QemuOptsList qemu_common_drive_opts; > diff --git a/vl.c b/vl.c > index 9975e5a..6bf37a2 100644 > --- a/vl.c > +++ b/vl.c > @@ -977,8 +977,14 @@ static void parse_name(QemuOpts *opts) > =20 > bool usb_enabled(bool default_usb) > { > - return qemu_opt_get_bool(qemu_get_machine_opts(), "usb", > - has_defaults && default_usb); > + return qemu_opt_get_bool(qemu_get_machine_opts(), "usb", > + has_defaults && default_usb); > +} > + > +bool qemu_has_defaults(void) > +{ > + fprintf(stderr, "has_d %d\n", has_defaults); Debugging leftover surely? Cheers, Andreas > + return has_defaults; > } > =20 > #ifndef _WIN32 >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg