]> xenbits.xensource.com Git - qemu-xen-3.4-testing.git/log
qemu-xen-3.4-testing.git
16 years agoMerge branch 'stable_0_10'
Ian Jackson [Tue, 14 Apr 2009 16:35:05 +0000 (17:35 +0100)]
Merge branch 'stable_0_10'

Conflicts:

block.c
hw/cirrus_vga.c
hw/vga.c

16 years agofix std-vga cli option
Ian Jackson [Tue, 14 Apr 2009 12:31:27 +0000 (13:31 +0100)]
fix std-vga cli option

currently the std-vga qemu command line option does not work anymore,
this patch fixes the issue.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agomapcache fixes (Stefano)
Ian Jackson [Tue, 14 Apr 2009 11:03:01 +0000 (12:03 +0100)]
mapcache fixes (Stefano)

this patch makes the new mapcache code cleaner and fixes few problems
introduced by the recent mapcache improvements.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoRecognise evdev(xx)_aliases(yy) and xfree86(xx)_aliases(yy) as keymap names.
aliguori [Mon, 13 Apr 2009 13:29:40 +0000 (13:29 +0000)]
Recognise evdev(xx)_aliases(yy) and xfree86(xx)_aliases(yy) as keymap names.

Newer Xorg use these with non-default kemaps (such as the ThinkPad keymap).

aliguori: this is from r7097 in trunk by balrog

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7098 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoMake PCI config status register read-only
aliguori [Fri, 10 Apr 2009 20:49:44 +0000 (20:49 +0000)]
Make PCI config status register read-only

From the documentation I can find, this register is supposed to be read-only.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7071 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFix crash on resolution change -> screen dump -> vga redraw (Avi Kivity)
aliguori [Fri, 10 Apr 2009 18:36:38 +0000 (18:36 +0000)]
Fix crash on resolution change -> screen dump -> vga redraw (Avi Kivity)

The vga screen dump function updates last_width and last_height,
but does not change the DisplaySurface that these variables describe.
A consequent vga_draw_graphic() will therefore fail to resize the
surface and crash.

Fix by invalidating the display state after a screen dump, forcing
vga_draw_graphic() to reallocate the DisplaySurface.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7069 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agopassthrough: Fix error handling when interrupt hypercall fails.
Ian Jackson [Wed, 8 Apr 2009 16:54:45 +0000 (17:54 +0100)]
passthrough: Fix error handling when interrupt hypercall fails.

This patch fixes error handling when interrupt hypercall fails.
This patch makes Interrupt Disable bit emulate type.

The policy of this patch is [ in a comment at the top of pass-through.c ]

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agoFix ia64 HVM boot failure. Remove mmap bounce buffer in ia64.
Ian Jackson [Wed, 8 Apr 2009 16:39:00 +0000 (17:39 +0100)]
Fix ia64 HVM boot failure.  Remove mmap bounce buffer in ia64.

For Non-MAPCACHE case, to get the virtual address corresponding to
guest physical address, only an offset value is added to guest
physical address.  With this patch, ia64 HVM boot failure bug can be
fixed.

[ This reverts part of 2ed2ee1704a4ef956ecc61848c84d12aaa4419d5,
  once again removing the bounce buffer in the non-MAPCACHE
  version of cpu_physical_memory_map. -iwj ]

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
16 years agosync DisplayAllocator interface
Ian Jackson [Wed, 8 Apr 2009 16:32:57 +0000 (17:32 +0100)]
sync DisplayAllocator interface

this simple patch sync's the DisplayAllocator interface with upstream
qemu. The only non trivial change, is the new ability for sdl to support
the DisplayAllocator interface, hence improving performances (avoid a
memcpy) when the guest is in text mode or uses a color depth of 8bpp or
24bpp (no DisplayState surface sharing allowed).

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoUpdate version for release
aliguori [Tue, 7 Apr 2009 01:57:17 +0000 (01:57 +0000)]
Update version for release

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7012 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFix find_device_type() to correctly identify floppy disk devices; (Luca Tettamanti)
aliguori [Tue, 7 Apr 2009 01:46:18 +0000 (01:46 +0000)]
Fix find_device_type() to correctly identify floppy disk devices; (Luca Tettamanti)
they are reported as DRIVE_REMOVABLE by win32.

Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7011 c046a42c-6fe2-441c-8c8c-71466251a162

16 years ago Fix savevm after BDRV_FILE size enforcement
aliguori [Sun, 5 Apr 2009 21:07:26 +0000 (21:07 +0000)]
 Fix savevm after BDRV_FILE size enforcement

 We now enforce that you cannot write beyond the end of a non-growable file.
 qcow2 files are not growable but we rely on them being growable to do
 savevm/loadvm.  Temporarily allow them to be growable by introducing a new
 API specifically for savevm read/write operations.

Reported-by: malc
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7005 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agostop dirty tracking just at the end of migration (Glauber Costa)
aliguori [Sun, 5 Apr 2009 19:33:41 +0000 (19:33 +0000)]
stop dirty tracking just at the end of migration (Glauber Costa)

If there is still work to do, it is not safe to assume we
can end the dirty tracking. Specifically, kvm can update the dirty
tracking log inside ram_save_block(), leaving pages still out of sync
if we go with the current code.

Based on a patch by Yaniv Kamay

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7002 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agocreate qemu_file_set_error (Glauber Costa)
aliguori [Sun, 5 Apr 2009 19:33:37 +0000 (19:33 +0000)]
create qemu_file_set_error (Glauber Costa)

This is mainly for consistency, since we don't want
anything outside of savevm setting it explicitly. There
are current no users of that in qemu tree, but there
are potential candidates on kvm-userspace. And avi
is a nice guy, let's be nice with him.

Based on a patch by Yaniv Kamay

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7001 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agopropagate error on failed completion (Glauber Costa)
aliguori [Sun, 5 Apr 2009 19:33:33 +0000 (19:33 +0000)]
propagate error on failed completion (Glauber Costa)

migrate_fd_put_ready() calls qemu_savevm_state_complete(),
but the later can fail.

If it happens, re-start the vm and propagate the error up

Based on a patch by Yaniv Kamay

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7000 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoqcow2: fix image creation for large, > ~2TB, images (Chris Wright)
aliguori [Sun, 5 Apr 2009 18:16:10 +0000 (18:16 +0000)]
qcow2: fix image creation for large, > ~2TB, images (Chris Wright)

When creating large disk images w/ qcow2 format, qcow2_create is hard
coded to creating a single refcount block.  This is insufficient for
large images, and will cause qemu-img to segfault as it walks off the
end of the refcount block.  Keep track of the space needed during image
create and create proper number of refcount blocks accordingly.

https://bugzilla.redhat.com/show_bug.cgi?id=491943

Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6988 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agopci_add storage: fix error handling for 'if' parameter (Eduardo Habkost)
aliguori [Sun, 5 Apr 2009 18:16:04 +0000 (18:16 +0000)]
pci_add storage: fix error handling for 'if' parameter (Eduardo Habkost)

This fixes:

 - The error message to show the actual if= argument value. It was showing
   the filename instead, because 'buf' is reaused on the filename parsing.
 - A bug that makes a block device to be created even when an unsupported if= arg
   is passed to pci_add.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6987 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFix (at least one cause of) qcow2 corruption. (Nolan Leake)
aliguori [Sun, 5 Apr 2009 18:15:59 +0000 (18:15 +0000)]
Fix (at least one cause of) qcow2 corruption. (Nolan Leake)

qcow2's get_cluster_offset() scans forward in the l2 table to find other
clusters that have the same allocation status as the first cluster.
This is used by (among others) qcow_is_allocated().

Unfortunately, it was not checking to be sure that it didn't fall off
the end of the l2 table.  This patch adds that check.

The symptom that motivated me to look into this was that
bdrv_is_allocated() was returning false when there was in fact data
there.  This is one of many ways this bug could lead to data corruption.

I checked the other place that scans for consecutive unallocated blocks
(alloc_cluster_offset()) and it appears to be OK:
    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
appears to prevent the same problem from occurring.

Signed-off-by: Nolan Leake <nolan <at> sigbus.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6986 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFix oops on 2.6.25 guest (Rusty Russell)
aliguori [Sun, 5 Apr 2009 18:15:54 +0000 (18:15 +0000)]
Fix oops on 2.6.25 guest (Rusty Russell)

I believe this is behind the following:
https://bugs.edge.launchpad.net/ubuntu/jaunty/+source/linux/+bug/331128

virtio_pci in 2.6.25 didn't do feature negotiation correctly: it acked every
bit.  Fortunately, we can detect this.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6985 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoReinstate bounce-buffer-based cpu_physical_memory_[un]map for ia64
Ian Jackson [Fri, 3 Apr 2009 15:17:22 +0000 (16:17 +0100)]
Reinstate bounce-buffer-based cpu_physical_memory_[un]map for ia64

This patch fixes the compilation error caused by the change set
of 191158d4c289d1bf7c154ad6b51f776f680982d5.
ia64 doesn't support mapcache yet, so not-mapcache version
of cpu_physical_memory_map/unmap are still necessary.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
16 years agohw/battery_mgmt.c: remove some spurious externs
Ian Jackson [Fri, 3 Apr 2009 14:45:06 +0000 (15:45 +0100)]
hw/battery_mgmt.c: remove some spurious externs

Declarations of objects with external linkage should appear only in
header files.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoxenstore: Set drives_table[].used
Ian Jackson [Fri, 3 Apr 2009 14:43:15 +0000 (15:43 +0100)]
xenstore: Set drives_table[].used

Setting this field, newly introduced upstream, prevents the core drive
option parser in vl.c from overwriting xenstore.c's work.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoDisable chroot and runas facilities in stubdom.
Ian Jackson [Fri, 3 Apr 2009 14:10:12 +0000 (15:10 +0100)]
Disable chroot and runas facilities in stubdom.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoPost-merge compilation fixes
Ian Jackson [Thu, 2 Apr 2009 15:22:28 +0000 (16:22 +0100)]
Post-merge compilation fixes

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoMerge tag 'stable_0_10_0.branchpoint'
Ian Jackson [Thu, 2 Apr 2009 12:51:27 +0000 (13:51 +0100)]
Merge tag 'stable_0_10_0.branchpoint'

Conflicts:

Makefile.target
block-bochs.c
block-cloop.c
block-parallels.c
block.c
console.c
console.h
hw/ide.c
hw/pc.c
hw/pci.c
hw/pci.h
hw/usb-hid.c
hw/vga.c
loader.c
net.h
posix-aio-compat.c
vl.c
vnc.c

16 years agofix vga draw_text duplications
Ian Jackson [Tue, 31 Mar 2009 17:01:04 +0000 (18:01 +0100)]
fix vga draw_text duplications

the last qemu merge left some code dups in vga_draw_text, this patch
fixes them.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoblock-vbd: implement support for splitting requests
Ian Jackson [Tue, 31 Mar 2009 16:19:49 +0000 (17:19 +0100)]
block-vbd: implement support for splitting requests

the main issue with stubdoms at the moment is that the new dma api does
not support an upper limit for the number of sectors in a single dma
transfer.
This means that block-vbd can issue blkfront_aio transfers that exceed
the blktap limit BLKIF_MAX_SEGMENTS_PER_REQUEST.
The attached qemu patch makes block-vbd split any request bigger than
the limit above.

The small xen patch is also needed to change struct blkfront_aiocb.
 [ The corresponding changeset in xen-unstable is 19463:f2cf89a4e762 -iwj ]

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agopassthrough: Update acpi_php_readb()'s comment
Ian Jackson [Tue, 31 Mar 2009 16:02:52 +0000 (17:02 +0100)]
passthrough: Update acpi_php_readb()'s comment

This relates to chagnes introduced in
"Allow any unused PCI device to be used for pass-through"
 [ ea4860c13aabe65622be97ae6796c3d646f499db ]

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoxen_machine_fv: Add missing #include of qemu-aio.h
Ian Jackson [Tue, 31 Mar 2009 15:57:20 +0000 (16:57 +0100)]
xen_machine_fv: Add missing #include of qemu-aio.h

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoxen: use mapcache for cpu_physical_memory_map
Ian Jackson [Tue, 31 Mar 2009 15:54:56 +0000 (16:54 +0100)]
xen: use mapcache for cpu_physical_memory_map

this patch improves qemu-xen's mapcache to be able to guarantee that
certain mappings are going to last until explicitly unmapped.
This capability is necessary to implement cpu_physical_memory_map and
cpu_physical_memory_unmap that are part of the new dma api.
This patch also provides the implementation of these two functions,
removing the one based on bounce buffers that we are currently using.

Current DMA throughput: ~10MB/s
DMA throughput with this patch:  ~27MB/s

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agopassthrough: Allow slots 1e and 1f to be used
Ian Jackson [Tue, 31 Mar 2009 15:52:24 +0000 (16:52 +0100)]
passthrough: Allow slots 1e and 1f to be used

This fixes an oversight in my recent patch "Allow any unused PCI device to
be used for pass-through" whereby attempts to use slots 1e and 1f for
pass-through would silently fail.

* This affects both static and manual selection of slots
* This affects both hot-plug and static pass-through

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoide: wait for outstanding aio requests before unplugging the disk
Ian Jackson [Tue, 31 Mar 2009 15:51:03 +0000 (16:51 +0100)]
ide: wait for outstanding aio requests before unplugging the disk

this patch adds a wait on the completion of any outstanding aio requests
before unplugging the hard drive.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoFixes from Christoph Egger
Ian Jackson [Tue, 31 Mar 2009 14:37:58 +0000 (15:37 +0100)]
Fixes from Christoph Egger

- xen-vl-exra.c: Only compile pci_emulation_add() w/  CONFIG_PASSTHROUGH
- Fix compiler confusion with tokens after #endif
- qemu-common.h: Fix merge botch with upstream
- qemu-xen.h: remove redundant declaration of pci_xen_platform_init
- xen_platform.c: take declaration of pci_xen_platform_init from
  xen_platform.h
- xen_platform.c: Make platform_fixed_ioport_save and
  platform_fixed_ioport_load static. They have no prototypes and aren't
  used elsewhere

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
16 years agopassthrugh: Fix double unbinding of INTx interrupt when PCI device hot-removed
Ian Jackson [Tue, 31 Mar 2009 10:46:09 +0000 (11:46 +0100)]
passthrugh: Fix double unbinding of INTx interrupt when PCI device hot-removed

This patch fixes double unbinding of INTx interrupt when PCI device is
hot-removed.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agopassthrough: Fix duplicated MAC addr when multi-port NIC assigned to HVM domain
Ian Jackson [Tue, 31 Mar 2009 10:45:38 +0000 (11:45 +0100)]
passthrough: Fix duplicated MAC addr when multi-port NIC assigned to HVM domain

This patch fixes duplicated MAC address when multi-port NIC is
assigned to HVM domain.

Currently multi-function device is shown as two single function
devices. e1000e driver and igb driver for linux add 1 to MAC address of
second port of multi-port NIC. But they don't add 1 to MAC address of
second port if NIC is single-function device. Because of this, the MAC
addresses of the first port and the second port are duplicated.

The patch make Header Type register passthrough-type. This means a
multi-function device is shown as two multi-function devices which
implement only one function. So e1000e driver and igb driver add 1 to
MAC address of second port.

When we use windows guest, the same issue occurs, the patch fix it.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agoioemu: Read pass-through vslot from xend
Ian Jackson [Tue, 31 Mar 2009 10:41:09 +0000 (11:41 +0100)]
ioemu: Read pass-through vslot from xend

This reads the vslot information supplied by xend, and should be
the final piece for this feature on the ioemu side.

There is also a xend portion of this patch which I will post separately.

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoioemu: allow xend to specify the slot for pass-through devices
Ian Jackson [Tue, 31 Mar 2009 10:40:30 +0000 (11:40 +0100)]
ioemu: allow xend to specify the slot for pass-through devices

Currently a slot may be specified for a hot-plug device,
but not for a pass-through device that is inserted at boot time.
This patch adds support for the latter.

The syntax is:
     BUS:DEV.FUNC[@VSLOT]
e.g: 0000:00:1d:0@7

This may be important as recent changes that allow any free PCI
slot to be used for pass-through (and hotplug) may case pass-through
devices to be assigned in different locations to before. Amongst
other things, specifying the slot will allow users to move them
back, if there is a need.

There is also a xend portion of this patch, which will be posted separately.

Signed-off-by: Simon Horman <horms@vereg.net.au>
16 years agoioemu: Do slot parsing inside of next_bdf
Ian Jackson [Tue, 31 Mar 2009 10:38:55 +0000 (11:38 +0100)]
ioemu: Do slot parsing inside of next_bdf

Currently only hotplug provides vslot information from xend.
A subsequent patch will have xend provide this information
for boot-time inserted pass-through devices too.

With this in mind, this patch makes some infrastructure
to parse bdf + slot information.

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoSH4: Add support for kernel cmdline
aurel32 [Tue, 31 Mar 2009 05:55:16 +0000 (05:55 +0000)]
SH4: Add support for kernel cmdline

Backport of revisions 6792, 6916, 6919 from trunk.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6960 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agochar: Fix closing of various char devices (Jan Kiszka)
aliguori [Sat, 28 Mar 2009 18:01:29 +0000 (18:01 +0000)]
char: Fix closing of various char devices (Jan Kiszka)

This patch fixes several issues around closing char devices. Affected
were pty (timer was left behind, even running), udp (no close handling
at all) and tcp (missing async IO handler cleanup). The bugs either
caused segfaults or stalled the qemu process. So far, hot-unplugging USB
serial adapters suffered from this.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6912 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agohost_device_remove: remove incorrect check for device name (Eduardo Habkost)
aliguori [Sat, 28 Mar 2009 15:51:46 +0000 (15:51 +0000)]
host_device_remove: remove incorrect check for device name (Eduardo Habkost)

There is no need to check for valid prefixes on the the device name
when removing it. If the device name is found on the vlan client list,
it can be removed, regardless of the prefix used on its name.

To reproduce the bug, just run this on the monitor:

 (qemu) host_net_add user name=foobar
 (qemu) host_net_remove 0 foobar
 invalid host network device foobar
 (qemu)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6890 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoEnable -k option on Win32 (Herve Poussineau)
aliguori [Sat, 28 Mar 2009 15:46:15 +0000 (15:46 +0000)]
Enable -k option on Win32 (Herve Poussineau)

Attached patch enables -k option on Win32. There is no reason to disable it.

Signed-off-by: Herve Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6889 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agopassthrough: fix buffer overflow of vslots
Ian Jackson [Wed, 25 Mar 2009 11:38:29 +0000 (11:38 +0000)]
passthrough: fix buffer overflow of vslots

Assuming we assign n devices, strlen(direct_pci) can be 13n and the
length of the old 'vslots' is 13n/3 which is smaller than 5n+1 (1
slot_str takes 5 bytes).  So we have to malloc a bigger buffer for
vslots.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
16 years agopassthrough: Register dpci_infos.php_devs.pt_dev in a common location
Ian Jackson [Wed, 25 Mar 2009 11:35:42 +0000 (11:35 +0000)]
passthrough: Register dpci_infos.php_devs.pt_dev in a common location

Currently power_on_php_slot() sets dpci_infos.php_devs[i].pt_dev itself
after the call to register_real_device(). While pt_init relies on
power_on_php_slot() to set this pointer.

It seems sensible to use the same behaviour for both callers.

There are no other callers of register_real_device()

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoioemu: call xenstore_store_serial_port_info() for xm console
Ian Jackson [Wed, 25 Mar 2009 11:29:54 +0000 (11:29 +0000)]
ioemu: call xenstore_store_serial_port_info() for xm console

call xenstore_store_serial_port_info() for xm console.
Without this patch, xm console doesn't work for hvm domain.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
[ Bug was introduced by me during most recent merge from upstream -iwj ]

16 years agoioemu: make more of passthrough.c and piix4acpi.c static
Ian Jackson [Wed, 25 Mar 2009 11:25:32 +0000 (11:25 +0000)]
ioemu: make more of passthrough.c and piix4acpi.c static

Make more of passthrough.c and piix4acpi.c static

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agopassthrough: unmap INTx interrupt on hot-remove
Ian Jackson [Tue, 24 Mar 2009 18:24:14 +0000 (18:24 +0000)]
passthrough: unmap INTx interrupt on hot-remove

This patch unmaps INTx interrupt on hot-remove.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agopassthrough: fix pt_chk_bar_overlap
Ian Jackson [Tue, 24 Mar 2009 18:23:29 +0000 (18:23 +0000)]
passthrough: fix pt_chk_bar_overlap

This patch fixes pt_chk_bar_overlap.

Current pt_chk_bar_overlap does not distinguish memory resources and
io resources. They are placed in different address space. So
pt_chk_bar_overlap should distinguish them.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agopassthrough: Fix MSI/MSI-X capability structure virtualization code
Ian Jackson [Tue, 24 Mar 2009 18:22:30 +0000 (18:22 +0000)]
passthrough: Fix MSI/MSI-X capability structure virtualization code

This patch fixes MSI/MSI-X capability structure virtualization code.

Currently, xen does not support multiple message (multiple vector).
So multiple message capable field should be emulated and fixed to 0
(single vector).

With the patch, my FC-HBA works when I assign it to guest domain where
windows 2008 runs.

In addition to this, initial values of emulated registers should be
the same with initial values defined in PCI spec. If initial values
are not defined, they should be 0. The emulated field mask and
read-only field mask are also fixed.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agocirrus: Do not clear vram area to 0xff when not yet allocated.
Ian Jackson [Tue, 24 Mar 2009 18:12:39 +0000 (18:12 +0000)]
cirrus: Do not clear vram area to 0xff when not yet allocated.

When restoring, the vram data pointer is not valid until (depending on
the version of the savefile) the guest has informed us what memory to
use.  Thus vram_ptr may be NULL.  In this patch we avoid attempting to
clear the video ram in this case.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoFix getting the configuration of PCI pass-through from xenstore
Ian Jackson [Tue, 24 Mar 2009 13:31:27 +0000 (13:31 +0000)]
Fix getting the configuration of PCI pass-through from xenstore

This patch fixes getting the configuration of PCI pass-through from xenstore.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
Acked-by: Dexuan Cui <dexuan.cui@intel.com>
16 years agoioemu: emulate No_Soft_Reset in PMCSR
Ian Jackson [Tue, 24 Mar 2009 13:30:10 +0000 (13:30 +0000)]
ioemu: emulate No_Soft_Reset in PMCSR

When pci_power_mgmt=0, the No_Soft_Reset field in power
management control/status register of a PCI device needs to be
emulated and fixed to 1. This bit indicates that devices
transitioning from D3 to D0 because of PowerState commands do not
perform an internal reset.

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
16 years agoDisable xen platform PCI device when xen_platform_pci=0 is specified
Ian Jackson [Mon, 23 Mar 2009 17:27:08 +0000 (17:27 +0000)]
Disable xen platform PCI device when xen_platform_pci=0 is specified

This patch is the ioemu side of the series.

- Alias the "platform_flags" byte of the ioport BAR to fixed byte port
  0x10, and don't remove existing "platform_flags" byte.

- Disable xen platform PCI device if "disable_pf" entry is 1. If there
  is not "disable_pf" entry, xen platform PCI device is enabled.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agosupport SR-IOV Virtual Function passthrough
Ian Jackson [Mon, 23 Mar 2009 17:19:30 +0000 (17:19 +0000)]
support SR-IOV Virtual Function passthrough

Emulate the Memory Space Enable bit in the Command register because it's
hardwired to 0 for the Virtual Function.

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
16 years agoqemu-xen: do not use pipe with stubdom
Ian Jackson [Mon, 23 Mar 2009 17:16:08 +0000 (17:16 +0000)]
qemu-xen: do not use pipe with stubdom

This patch allows stubdoms to start after the recent merge.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agofix stubdomain after DisplayState changes
Ian Jackson [Mon, 23 Mar 2009 17:15:12 +0000 (17:15 +0000)]
fix stubdomain after DisplayState changes

this patch fixes few stubdom issues arised after the recent DisplayState
changes (not yet pushed to qemu-xen-unstable).
The main problem is that we need to touch the newly allocated pages
before sharing them, because minios allocates on first write.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoFix passthrough regression
Ian Jackson [Mon, 23 Mar 2009 17:00:50 +0000 (17:00 +0000)]
Fix passthrough regression

pt_init() iterates through the PHP slots independantly of
the assignment that occurs inside __insert_to_pci_slot
which is called by register_real_device(). It assumes
that vslots are assigned in order sarting at PHP_SLOT_START.

This was valid before my change, although why it didn't take the
simpler option of just checking what value had been assigned to
pt_dev->dev.devfn in register_real_device() is a mystery to
me [Simon].  Its also a mystery to what valid circumstance could lead
to pt_init() using 0 (a.k.a. unknown?) as the vslot.

My patch made one the assumptions that pt_init() made about slot numbers
invalid. That is, they don't start at PHP_SLOT_START, they start
wherever there is a free device.

A simple solution seems to be to use the value assigned to
pt_dev->dev.devfn in register_real_device().

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoFixes for git ioemu tree from Christoph Egger
Ian Jackson [Mon, 23 Mar 2009 16:47:35 +0000 (16:47 +0000)]
Fixes for git ioemu tree from Christoph Egger

 Make ioemu build w/o CONFIG_PASSTHROUGH
- Make ioemu build w/ TAPGIFNAME defined
- Make pci_emulation_add non-static as it is used in different files
- remove redundant variable re-declarations/re-definitions
- Make xenstore functions static. They have no prototypes and aren't used
  elsewhere
- Initialize xenpv_machine correctly (xen_init_pv didn't match what
  QEMUmachine expected)
- Misc compiler warning fixes

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
16 years agoxen_machine_pv.c: kill unused variables
Ian Jackson [Mon, 23 Mar 2009 16:42:03 +0000 (16:42 +0000)]
xen_machine_pv.c: kill unused variables

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
16 years agouse uint32_t for xen_domid
Ian Jackson [Mon, 23 Mar 2009 16:39:54 +0000 (16:39 +0000)]
use uint32_t for xen_domid

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
16 years agoFixup dummy cpu setup.
Ian Jackson [Mon, 23 Mar 2009 16:39:29 +0000 (16:39 +0000)]
Fixup dummy cpu setup.

Passing NULL to cpu_init() doesn't work in upstream qemu.
Also make sure the dummy cpu is in halted mode.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
16 years agoxen_machine_pv.c: delete pointless comment.
Ian Jackson [Mon, 23 Mar 2009 16:39:09 +0000 (16:39 +0000)]
xen_machine_pv.c: delete pointless comment.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
16 years agoxen_machine_pv.c: switch to C99 initializers
Ian Jackson [Mon, 23 Mar 2009 16:38:45 +0000 (16:38 +0000)]
xen_machine_pv.c: switch to C99 initializers

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
16 years agoCorrect compilation error in bdf_to_slow
Ian Jackson [Mon, 23 Mar 2009 16:35:27 +0000 (16:35 +0000)]
Correct compilation error in bdf_to_slow

This commit:
    commit 3fcc8c62058a60a31d762da627d4325137eea813
make __insert_to_pci_slot idempotent
Signed-off-by: Simon Horman <horms@verge.net.au>
has a trivial compilation error which I now fix.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agomake __insert_to_pci_slot idempotent
Ian Jackson [Mon, 23 Mar 2009 16:31:57 +0000 (16:31 +0000)]
make __insert_to_pci_slot idempotent

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoAllow any unused PCI device to be used for pass-through
Ian Jackson [Mon, 23 Mar 2009 16:30:41 +0000 (16:30 +0000)]
Allow any unused PCI device to be used for pass-through

Allow any unused PCI device to be used for pass-through.
This includes allowing these devices to be used for hotplug.

There are companion xend and hvmloader patches.

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoUse test_pci_slot() to test if a php slot is valid, in use or free
Ian Jackson [Mon, 23 Mar 2009 16:28:07 +0000 (16:28 +0000)]
Use test_pci_slot() to test if a php slot is valid, in use or free

Signed-off-by: Simon Horman <horms@verge.net.au>
16 years agoMore stubdom build fixes.
Ian Jackson [Mon, 23 Mar 2009 15:58:28 +0000 (15:58 +0000)]
More stubdom build fixes.

* Do not fail to build stubdom if the compiler fails to optimise out
  never-called static functions containing undefined references.
* Properly disable stubdom ioemu docs build.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoconfigure sensitive to user locale (Andreas Faerber)
aliguori [Sun, 22 Mar 2009 03:01:39 +0000 (03:01 +0000)]
configure sensitive to user locale (Andreas Faerber)

On German Fedora 9, no KVM errors are displayed.
This is because configure greps for "error:", which is locale-sensitive.

Use LANG=C for configure to find and display errors as expected.

Signed-off-by: Andreas Faerber <andreas.faerber@web.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6883 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFix VGA issue introduced by r6349 (malc)
aliguori [Sun, 22 Mar 2009 02:59:21 +0000 (02:59 +0000)]
Fix VGA issue introduced by r6349 (malc)

Thanks to Robert Riebisch for bisection

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6882 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoUpdate version for release
aliguori [Sat, 21 Mar 2009 23:02:41 +0000 (23:02 +0000)]
Update version for release

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6880 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoRename stable branch
aliguori [Sat, 21 Mar 2009 23:00:32 +0000 (23:00 +0000)]
Rename stable branch

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6879 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoRestore old stable branch
aliguori [Sat, 21 Mar 2009 22:59:47 +0000 (22:59 +0000)]
Restore old stable branch

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6878 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoAdd release_0_10_1 tag
aliguori [Sat, 21 Mar 2009 22:34:21 +0000 (22:34 +0000)]
Add release_0_10_1 tag

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6876 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFix the build for CONFIG_PASSTHROUGH=''
Ian Jackson [Fri, 20 Mar 2009 17:02:10 +0000 (17:02 +0000)]
Fix the build for CONFIG_PASSTHROUGH=''

There was a misplaced #endif (mistake made during the merge).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoUpdate Changelog
aliguori [Fri, 20 Mar 2009 16:22:31 +0000 (16:22 +0000)]
Update Changelog

git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6869 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agovirtio: Allow guest to defer VIRTIO_F_NOTIFY_ON_EMPTY (Alex Williamson)
aliguori [Fri, 20 Mar 2009 16:18:45 +0000 (16:18 +0000)]
virtio: Allow guest to defer VIRTIO_F_NOTIFY_ON_EMPTY (Alex Williamson)

There may be cases where the guest does not want the avail queue
interrupt, even when it's empty.  For the virtio-net case, the
guest may use a different buffering scheme or decide polling for
used buffers is more efficient.  This can be accomplished by simply
checking for whether the guest has acknowledged the existing notify
on empty flag.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6868 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoe1000: Fix RX descriptor low threshold interrupt logic (Alex Williamson)
aliguori [Fri, 20 Mar 2009 16:18:39 +0000 (16:18 +0000)]
e1000: Fix RX descriptor low threshold interrupt logic (Alex Williamson)

The RXDMT0 interrupt is supposed to fire when the number of free
RX descriptors drops to some fraction of the total descriptors.
However in practice, it seems like we're adding this interrupt
cause on every RX.  Fix the logic to treat (tail - head) as the
number of free entries rather than the number of used entries.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6867 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agox86: Add NULL check to lsl (Jan Kiszka)
aliguori [Fri, 20 Mar 2009 16:18:35 +0000 (16:18 +0000)]
x86: Add NULL check to lsl (Jan Kiszka)

According to the Intel specs, lsl performs a check against NULL for the
provided selector, just like lar does. helper_lar() includes the
corresponding code, helper_lsl() was lacking it so far.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6866 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoxen-setup-stubdom: Actually plumb through XEN_ROOT
Ian Jackson [Fri, 20 Mar 2009 15:58:24 +0000 (15:58 +0000)]
xen-setup-stubdom: Actually plumb through XEN_ROOT

We need to explicitly pass XEN_ROOT into the generated
config-host.mak.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoFix some syntax problems in xen-setup-stubdom
Ian Jackson [Fri, 20 Mar 2009 11:10:46 +0000 (11:10 +0000)]
Fix some syntax problems in xen-setup-stubdom

The location of my test build directory had accidentally crept into
the hardcoded settings.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoPost-merge compilation fixes for stubdom
Ian Jackson [Wed, 18 Mar 2009 16:32:53 +0000 (16:32 +0000)]
Post-merge compilation fixes for stubdom

Much of this is very ugly.  Sadly that's a consequence of the stubdom
and upstream build systems and nothing much can be done about it.

However on the upside with this change we discontinue use of the
upstream `configure' script for stubdom (as it gives wrong answers),
in favour of a new xen-setup-stubdom script.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agopassthrough: msi/msix clean up on hotplug remove
Ian Jackson [Mon, 16 Mar 2009 18:15:47 +0000 (18:15 +0000)]
passthrough: msi/msix clean up on hotplug remove

The passthrough MSI/MSI-X should be unbound and unmapped when
unregister_real_device is called, this patch fix this.

Signed-off-by: Qing He <qing.he@intel.com>
16 years agopassthrough: fix pci-dettach issue
Ian Jackson [Mon, 16 Mar 2009 18:04:35 +0000 (18:04 +0000)]
passthrough: fix pci-dettach issue

Commit 8c771eb6294afc5b3754a9e3de51568d4e5986c2 breaks guest PCI hotplug:

Before pt_config_delete() ->
qemu_free_timer(ptdev->pm_state->pm_timer), we should invoke
qemu_del_timer(), otherwise, qemu_run_timers() would access a
qemu_free_timer()-ed timer.  The below patch fixes the issue.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
16 years agopassthrough: make management of PCI D-states by guest optional
Ian Jackson [Mon, 16 Mar 2009 18:03:23 +0000 (18:03 +0000)]
passthrough: make management of PCI D-states by guest optional

Commit 8c771eb6294afc5b3754a9e3de51568d4e5986c2 enables the guest OS
to program D0-D3hot states of the assigned device, however,
D3hot state in some PCI devices causes the failure of domain
creation/destruction.

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
16 years agoxenfb shared buffer
Ian Jackson [Mon, 16 Mar 2009 17:25:35 +0000 (17:25 +0000)]
xenfb shared buffer

After the recent DisplayState changes is now possible to share the xenfb
backend buffer with the display frontend (sdl, vnc), avoid a memcpy for
each screen update.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoAdd missing #include <assert.h>
Ian Jackson [Mon, 16 Mar 2009 16:53:15 +0000 (16:53 +0000)]
Add missing #include <assert.h>

exec-dm.c now has an assert.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoqemu-dm: Provide bounce-buffer based cpu_physical_memory_map
Ian Jackson [Mon, 16 Mar 2009 16:52:21 +0000 (16:52 +0000)]
qemu-dm: Provide bounce-buffer based cpu_physical_memory_map

The xc_map_foreign_batch version was slow (and also apparently buggy).
The bounce buffer version works nicely, although we have to
clone-and-hack a bunch of stuff from exec.c.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoCompile pstrcpy_targphys on CONFIG_DM too
Ian Jackson [Mon, 16 Mar 2009 16:51:21 +0000 (16:51 +0000)]
Compile pstrcpy_targphys on CONFIG_DM too

This was accidentally turned off during the merge.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
16 years agoFix option parsing; override upstream `-d' option for `domain'.
Ian Jackson [Mon, 16 Mar 2009 16:50:49 +0000 (16:50 +0000)]
Fix option parsing; override upstream `-d' option for `domain'.

Pending change to xend to pass arguments differently, we need to
suppress the -d logfile parameter.  Also we accidentally dropped
HAS_ARG from -vcpus during the merge.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoIntroduce piecemeal VGA reset from upstream.
Ian Jackson [Mon, 16 Mar 2009 16:49:39 +0000 (16:49 +0000)]
Introduce piecemeal VGA reset from upstream.

This fixes null pointer dereference bugs introduced by the merge.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoPost-merge compilation fixes
Ian Jackson [Mon, 16 Mar 2009 13:47:18 +0000 (13:47 +0000)]
Post-merge compilation fixes

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agotemporarily disable logging around pci config writes (Avi Kivity)
aliguori [Fri, 13 Mar 2009 18:11:21 +0000 (18:11 +0000)]
temporarily disable logging around pci config writes (Avi Kivity)

A pci config write may remap the vga linear frame buffer, confusing the
memory slot dirty logging logic.

Fixed Windows with -vga std.

Signed-off-by: Avi Kivity <avi@redhat.com>
Sigend-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6854 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agostop dirty logging while updating cirrus bank memory (Glauber Costa)
aliguori [Fri, 13 Mar 2009 18:11:17 +0000 (18:11 +0000)]
stop dirty logging while updating cirrus bank memory (Glauber Costa)

Otherwise, slot tracking gets confused.

This fixes a screen corruption bug with Ubuntu guest installation.

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6853 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoUpdate changelog
aliguori [Fri, 13 Mar 2009 16:22:40 +0000 (16:22 +0000)]
Update changelog

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6848 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoqemu:virtio-net: Check return size on the correct sg list (Alex Williamson)
aliguori [Fri, 13 Mar 2009 16:19:04 +0000 (16:19 +0000)]
qemu:virtio-net: Check return size on the correct sg list (Alex Williamson)

When checking that the size of the control virtqueue return field
is sufficient, use the correct sg list.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6847 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agomake qemu_announce_self handle non contiguous net tables (Marcelo Tosatti)
aliguori [Fri, 13 Mar 2009 16:18:57 +0000 (16:18 +0000)]
make qemu_announce_self handle non contiguous net tables (Marcelo Tosatti)

With hotplug nd_table might contain holes.

Noticed by Eduardo Habkost.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10_0@6846 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoMerge branch 'stefano.display-changes'
Ian Jackson [Fri, 13 Mar 2009 12:30:22 +0000 (12:30 +0000)]
Merge branch 'stefano.display-changes'

Conflicts:

curses.c
hw/cirrus_vga.c
hw/g364fb.c
hw/g364fb_template.h
hw/integratorcp.c
hw/jazz_led.c
hw/mips.h
hw/mips_jazz.c
hw/musicpal.c
hw/nseries.c
hw/omap_lcdc.c
hw/palm.c
hw/pc.h
hw/pl110.c
hw/ppc_oldworld.c
hw/sun4m.c
hw/vmware_vga.c
qemu-char.h
qemu-common.h
vl.c
vnchextile.h

16 years agoMerge branch 'master' of ../../1/qemu-iwj
Ian Jackson [Fri, 13 Mar 2009 12:09:06 +0000 (12:09 +0000)]
Merge branch 'master' of ../../1/qemu-iwj

Conflicts:

block-raw-posix.c

16 years agoIntroduce and use qemu_paio_fsync
Ian Jackson [Fri, 13 Mar 2009 12:04:21 +0000 (12:04 +0000)]
Introduce and use qemu_paio_fsync

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>