Commit 4be6693a authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mst/tags/for_anthony' into staging 



pc last minute fixes for 1.8

This has a patch that drops an unused FW CFG entry.
I think it's best to include it before 1.7 to avoid
the need to maintain it in compat machine types.

There's also a doc bugfix by Amos: I'm guessing
doc fixes are still fair game even at this late stage.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Mon 18 Nov 2013 03:48:14 AM PST using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Amos Kong (1) and Igor Mammedov (1)
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  doc: fix hardcoded helper path
  pc: disable pci-info

Message-id: 1384775449-6693-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 38dc7490 420508fb

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 }; 
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };



static bool has_pvpanic;

static bool has_pci_info = true;

static bool has_pci_info;

static bool has_acpi_build = true;



/* PC hardware initialisation */

hw/i386/pc_q35.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#define MAX_SATA_PORTS     6



static bool has_pvpanic;

static bool has_pci_info = true;

static bool has_pci_info;

static bool has_acpi_build = true;



/* PC hardware initialisation */

qemu-options.hx

+3 −3
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ to disable script execution. 


If running QEMU as an unprivileged user, use the network helper

@var{helper} to configure the TAP interface. The default network

helper executable is @file{/usr/local/libexec/qemu-bridge-helper}.

helper executable is @file{/path/to/qemu-bridge-helper}.



@option{fd}=@var{h} can be used to specify the handle of an already

opened host TAP interface.
@@ -1629,7 +1629,7 @@ qemu-system-i386 linux.img \ 
#launch a QEMU instance with the default network helper to

#connect a TAP device to bridge br0

qemu-system-i386 linux.img \

                 -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper"

                 -net nic -net tap,"helper=/path/to/qemu-bridge-helper"

@end example



@item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}]
@@ -1638,7 +1638,7 @@ Connect a host TAP network interface to a host bridge device. 


Use the network helper @var{helper} to configure the TAP interface and

attach it to the bridge. The default network helper executable is

@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge

@file{/path/to/qemu-bridge-helper} and the default bridge

device is @file{br0}.



Examples: