]> xenbits.xensource.com Git - qemu-xen-4.0-testing.git/log
qemu-xen-4.0-testing.git
16 years agoioemu: various fixes to `Use main memory for video memory' t.18383+
Ian Jackson [Thu, 11 Sep 2008 11:44:33 +0000 (12:44 +0100)]
ioemu: various fixes to `Use main memory for video memory'

- fix ioemu segv with old firmware
  Without notifying ioemu of address, ioemu will segv.

- fix qemu-dm segv with malicous firmware
  If notifying ioemu more than once, ioemu will segv.

Usually such cases don't happen, but malicious guest can
do it intentionally.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
(Cross-ported from xen-unstable
 18449:33d907ff2b043c4bff5c265737dab0bb52d6f773
this is a fix to the patch
 0844825b76924eac7719875b3886072b74e19397
which itself was cross-ported from xen-unstable
 18383:dade7f0bdc8d6b36b1914598d83c616ee5ce97cb

There were no conflicts or problems with patch -l.)

16 years agohvm: Use main memory for video memory.
Ian Jackson [Thu, 11 Sep 2008 11:41:14 +0000 (12:41 +0100)]
hvm: Use main memory for video memory.

qemu allocates video memory, the extra 8MB memory ballooning is not
available any more, because it got consumed by the other domain.

This fixes it by taking video memory from the main memory:

- make hvmloader use e820_malloc to reserve some of the main memory
  and notify ioemu of its address through the Xen platform PCI card.
- add XENMAPSPACE_mfn to the xen_add_to_physmap memory op, to allow
  ioemu to move the MFNs between the original position and the PCI
  mapping, when LFB acceleration is disabled/enabled
- add a remove_from_physmap memory op, to allow ioemu to unmap it
  completely for the case of old guests with acceleration disabled.
- add xc_domain_memory_translate_gpfn_list to libxc to allow ioemu to
  get the MFNs of the video memory.
- have xend save the PCI memory space instead of ioemu: if a memory
  page is there, the guest can access it like usual memory, so xend
  can safely be responsible to save it.  The extra benefit is that
  live migration will apply the logdirty optimization there too.
- handle old saved images, populating the video memory from ioemu if
  really needed.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Cross-ported from xen-unstable
 18383:dade7f0bdc8d6b36b1914598d83c616ee5ce97cb
using patch -l, with only one fixup needed: [un]set_mm_mapping needed
to be removed from hw/cirrus_vga.c rather than vl.c

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoFix map cache low/high/low bug
Ian Jackson [Tue, 9 Sep 2008 13:02:03 +0000 (14:02 +0100)]
Fix map cache low/high/low bug

This small patch fixes an issue leading to a crash (segfault, although
with earlier changesets I was seeing sigbus - not sure what changed)
in qemu-dm when the following conditions occur:

1. A valid mapping for a bucket on a low address exists

2. Immediately after accessing memory mapped in this bucket, an access
occurs to a high (beyond assigned ram) address beyond the 1GB limit
for 32bit map cache wrapping around to the previous bucket's entry
number.

3. The next call to map cache again accesses the low address.

In this scenario, the guest mem for the low bucket has been unmapped
by the remap_bucket caused by 2., but because the valid_mapping
bit-test fails, map_cache returns before last_address_index has been
updated. The subsequent call to map_cache therefore never remaps the
low, valid bucket and instead returns a vaddr pointing to memory that
has failed to get mapped.

Signed-off-by: Trolle Selander <trolle.selander@eu.citrix.com>
16 years agoremove QEMU_OPTION_pci
Ian Jackson [Mon, 8 Sep 2008 16:04:58 +0000 (17:04 +0100)]
remove QEMU_OPTION_pci

QEMU_OPTION_pci is no longer handled in the switch() in vl.c and is
therefore obsolete.  Therefore remove it.  QEMU_OPTION_direct_pci is
the current mechanism.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
16 years agofix offset of MSI-X memory mapped table.
Ian Jackson [Fri, 5 Sep 2008 09:32:49 +0000 (10:32 +0100)]
fix offset of MSI-X memory mapped table.

This patch fixes offset of MSI-X memory mapped table.

Current code does not set dev->msix->table_off variable.
The offset of MSI-X memory mapped table is treated as 0.
The wrong region is unmapped from guest physical memory space.
As a result, guest device driver can't access memory mapped resource.

The patch fixes this issue. My MegaRAID SAS assigned to guest domain
becomes working with the patch.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agosupport PCI Express Capability Structure version 1
Ian Jackson [Wed, 3 Sep 2008 10:26:06 +0000 (11:26 +0100)]
support PCI Express Capability Structure version 1

Suppport PCI Express Capability Structure version 1.  The format of
PCI Express Capability Structure is different between version 1 and
version 2.  Current code supports only version 2.  This might cause
conflict with other capability structure if device implement
version 1.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agofix multiple pci-attach/pci-detach by removing meaningless irq_index
Ian Jackson [Mon, 1 Sep 2008 09:34:37 +0000 (10:34 +0100)]
fix multiple pci-attach/pci-detach by removing meaningless irq_index

For HVM guest, we can't do pci-attach/pci-detach for >64 times due to
the meaningless checking in pci_register_device(). This patches
removes it.

With the patches, I [Dexuan] made a test of 300 times of attach/detach
and everything works well.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
16 years agoMerge branch 'qemu'
Ian Jackson [Thu, 28 Aug 2008 17:01:18 +0000 (18:01 +0100)]
Merge branch 'qemu'

16 years agoNicer fix for spurious messages from configure when GCC3 is missing.
Ian Jackson [Tue, 22 Jul 2008 15:28:06 +0000 (16:28 +0100)]
Nicer fix for spurious messages from configure when GCC3 is missing.

This reverts b5123e05cce4be4c6c8c822fad0f0df4c053da06 and replaces it
with a nice simple change, namely to change  test ... -a ...  with
test ... && test ... .  That provides shortcut evaluation.

Thanks to Andre Przywara who provided this one-line change as an
update to the previous commit.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoMerge branch 'qemu'
Ian Jackson [Thu, 28 Aug 2008 14:46:36 +0000 (15:46 +0100)]
Merge branch 'qemu'

16 years ago[passthrough] make upper field of 64 bit bar writable
Ian Jackson [Thu, 28 Aug 2008 14:41:23 +0000 (15:41 +0100)]
[passthrough] make upper field of 64 bit bar writable

This patch makes upper field of 64 bit base address register writable.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agoDon't compile translate-all.c.
Ian Jackson [Thu, 28 Aug 2008 14:40:46 +0000 (15:40 +0100)]
Don't compile translate-all.c.

We do not need the translation / code emulator for Xen.
Disabling it makes it possible to build qemu-xen on ia64.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
16 years agoconfigure fix for aio library on BSD
Ian Jackson [Thu, 28 Aug 2008 14:34:57 +0000 (15:34 +0100)]
configure fix for aio library on BSD

BSD needs -lrt.  Patch thanks to Christoph Egger.

16 years agoUse CTYPE for isalpha in block-vvfat.c.
Ian Jackson [Thu, 28 Aug 2008 14:32:50 +0000 (15:32 +0100)]
Use CTYPE for isalpha in block-vvfat.c.

This call was missing the fix from:

  commit 5ed6aa6153110050c29bcd600a1424014cfbf1d4
  Author: Ian Jackson <iwj@mariner.uk.xensource.com>
  Date:   Wed Feb 20 16:30:05 2008 +0000

      Use new CTYPE macro for <ctype.h>

      This avoids passing a negative int to isfoobar,
      which is not allowed

Thanks to Christoph Egger for pointing it out (although we do not use
his proposed fix).

16 years agoDrop duplication opengl configuration flags
Ian Jackson [Thu, 28 Aug 2008 14:11:55 +0000 (15:11 +0100)]
Drop duplication opengl configuration flags

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agoFix unmapping issue on hot-removing pass-thru device xen-3.3.0 xen-3.3.0-rc6
Keir Fraser [Wed, 20 Aug 2008 08:09:28 +0000 (09:09 +0100)]
Fix unmapping issue on hot-removing pass-thru device

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agoMerge latara:/usr/groups/xencore/HG/qemu-xen-unstable xen-3.3.0-rc5
Ian Jackson [Fri, 15 Aug 2008 12:41:49 +0000 (13:41 +0100)]
Merge latara:/usr/groups/xencore/HG/qemu-xen-unstable

16 years agoFix new USB HID queueing.
Ian Jackson [Fri, 15 Aug 2008 12:40:58 +0000 (13:40 +0100)]
Fix new USB HID queueing.

This commit:

    commit 28b7599603cc2165cd68961be034979657759f40
    Author: Ian Jackson <iwj@mariner.uk.xensource.com>
    Date:   Fri May 9 15:50:33 2008 +0100

Queue some mouse events.

was full of bugs.

16 years agoTry to fix USB HID and make the HID reports readable.
Ian Jackson [Fri, 15 Aug 2008 10:38:06 +0000 (11:38 +0100)]
Try to fix USB HID and make the HID reports readable.

Decode HID report Items in the comments.
Invert mouse wheel direction as per Alexander Graf's report and as we already do in the tablet.
Clamp the Relative values to -127:127 as we claimed in the HID descriptors.

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

(Cherry picked from qemu upstream branch, git commit
  976f8eef23eb571b6707d7bdec488f6c6ae4231b)

16 years agoMSI-X: enhancement
Keir Fraser [Wed, 13 Aug 2008 13:12:59 +0000 (14:12 +0100)]
MSI-X: enhancement

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
16 years agodrop QEMU_ prefix from QEMU_LIST_* xen-3.3.0-rc4
Keir Fraser [Fri, 8 Aug 2008 09:51:17 +0000 (10:51 +0100)]
drop QEMU_ prefix from QEMU_LIST_*

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agofix typo in serial emulation
Keir Fraser [Fri, 8 Aug 2008 09:47:10 +0000 (10:47 +0100)]
fix typo in serial emulation

There is a small bug on the serial emulation code that prevents kgdb
from working correctly over the serial.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agopass-through: Fix I/O BAR mapping problem xen-3.3.0-rc3
Keir Fraser [Wed, 6 Aug 2008 09:55:38 +0000 (10:55 +0100)]
pass-through: Fix I/O BAR mapping problem

Check BAR type indicator to avoid I/O BAR being mistaken as 64-bit =
memory BAR.

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
16 years agofix a bug in serial_load
Keir Fraser [Wed, 6 Aug 2008 08:45:02 +0000 (09:45 +0100)]
fix a bug in serial_load

Currently we are trying to read the same value twice in the serial_load
function, this patch fixes that.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoxend does not pass us -m option, so direct HVM Linux loading
Keir Fraser [Tue, 5 Aug 2008 12:24:47 +0000 (13:24 +0100)]
xend does not pass us -m option, so direct HVM Linux loading
approximates end of low memory via a different method.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
16 years agostubdom: fix read-only disks access
Keir Fraser [Mon, 4 Aug 2008 10:08:09 +0000 (11:08 +0100)]
stubdom: fix read-only disks access

There is no need for a flush on read-only disks.  It would actually even
error out and disturb the guest.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agoMerge branch 'qemu'
Ian Jackson [Fri, 1 Aug 2008 16:16:58 +0000 (17:16 +0100)]
Merge branch 'qemu'

16 years agoFix medium change device lookup.
Ian Jackson [Fri, 1 Aug 2008 16:15:24 +0000 (17:15 +0100)]
Fix medium change device lookup.

Previously, medium change notifications would be handled with respect
to the wrong emulated disk drive.  This would make many configurations
(particularly ones with CDs and many hard disks) break.  (A medium
change notification occurs at the start for every removeable device.)

Thanks to Haicheng Li at Intel for the report,
 http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1314

16 years ago[ide] Check that asynchronous (DMA) submission succeeds
Ian Jackson [Fri, 1 Aug 2008 15:56:13 +0000 (16:56 +0100)]
[ide] Check that asynchronous (DMA) submission succeeds

If it does not, abort the command immediately rather than dropping
it on the floor.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agopassthrough: fix flag for expansion rom base address register.
Keir Fraser [Fri, 1 Aug 2008 09:06:13 +0000 (10:06 +0100)]
passthrough: fix flag for expansion rom base address register.

pt_bar_reg_parse() is called for expansion rom base address register.
Currently it returns PT_BAR_FLAG_MEM if bit 0 is 0. It returns
PT_BAR_FLAG_IO if bit 0 is 1.

But bit 0 in expansion rom base address register is enable bit. If bit
0 is 1 for some reason, it returns PT_BAR_FLAG_IO. Expansion rom is
mapped to memory space. It should return PT_BAR_FLAG_MEM.

After applying this patch, it returns PT_BAR_FLAG_MEM regardless
of bit 0, when it is called for expansion rom base address register.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agopassthrough: fix corrupting register value in pt_pci_write_config().
Keir Fraser [Fri, 1 Aug 2008 09:05:36 +0000 (10:05 +0100)]
passthrough: fix corrupting register value in pt_pci_write_config().

I forgot to shift value read from real device. If the emulated register offset
is not aligned with 4 byte, the write emulation will not be handled well
because of corrupting register value read from real device.
The patch fixes this issue.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agopassthru: fix libpci error handling.
Keir Fraser [Fri, 1 Aug 2008 09:04:39 +0000 (10:04 +0100)]
passthru: fix libpci error handling.

libpci returns ALL F when error occurs. Currently, if libpci returns ALL
F, emulation stops. But it is possible that the field of real register
which is read by guest software is ALL F.

After applying this patch, if libpci returns ALL F, ioemu will log
warning message and continue the emulation.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agopassthrough: fix writing handlers for base address registers.
Keir Fraser [Fri, 1 Aug 2008 09:01:05 +0000 (10:01 +0100)]
passthrough: fix writing handlers for base address registers.

- Current implementation can not work fine when base address registers
  are accessed via 1 byte write access and 2 byte write access. This
  patch enables them.

- Currently guest software can set address which is not aligned
  with resource size and page size. The patch does not allow guest
  software to set unaligned address.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agopassthrough: fix log messages and comments
Keir Fraser [Fri, 1 Aug 2008 09:00:14 +0000 (10:00 +0100)]
passthrough: fix log messages and comments

- fix log messages to make analysis easier when issue occurs.

- remove verbose message.

- add comments in the source code.

- fix wrong comments in the source code.

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agocross-build fix re -msse2 flag and cc-option
Ian Jackson [Thu, 31 Jul 2008 15:17:41 +0000 (16:17 +0100)]
cross-build fix re -msse2 flag and cc-option

- The ioemu version of cc-option doesn't take $(CC) as the first
  argument, so all builds were getting -msse2 regardless of
  architecture.

Signed-off-by: Aron Griffis <aron@hp.com>
16 years agoFix warnings
Ian Jackson [Wed, 30 Jul 2008 16:13:46 +0000 (17:13 +0100)]
Fix warnings

[This] patch fixes two warnings when compiling.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Manually cherry-picked from c9dba66abe8f4c4df28f3b32befe49da1b749a48

16 years agofix SDL mouse events processing xen-3.3.0-rc2
Ian Jackson [Wed, 30 Jul 2008 15:46:30 +0000 (16:46 +0100)]
fix SDL mouse events processing

This fixes SDL mouse events processing:
- GetRelativeMouseState() always returns the last position, so when the
  polling loop gets several mouse events in one go, we would send
  useless 'no move' events, let's avoid that.
- So as to make sure we don't miss any mouse click / double click, we
  should not use GetRelativeMouseState() to get the button state, but
  rather keep records of the button state ourselves (I've requested SDL
  developers to provide it directly in the event in SDL 1.3).
- bev->state doesn't contain the button state but whether the event is a press
  or a release. Use bev->button instead.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoFix typo in error message re pciutils-dev
Ian Jackson [Wed, 30 Jul 2008 15:27:03 +0000 (16:27 +0100)]
Fix typo in error message re pciutils-dev

Thanks to report from Stefano Stabellini

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoFix warnings
Ian Jackson [Wed, 30 Jul 2008 15:24:54 +0000 (16:24 +0100)]
Fix warnings

[This] patch fixes two warnings when compiling.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
16 years agoMerge latara:/usr/groups/xencore/HG/qemu-xen-unstable
Ian Jackson [Wed, 30 Jul 2008 11:08:53 +0000 (12:08 +0100)]
Merge latara:/usr/groups/xencore/HG/qemu-xen-unstable

16 years agoMerge branch 'qemu'
Ian Jackson [Wed, 30 Jul 2008 11:07:35 +0000 (12:07 +0100)]
Merge branch 'qemu'

16 years agoUse fd signal trick to break us out of select; do not sigwait
Ian Jackson [Wed, 30 Jul 2008 11:06:29 +0000 (12:06 +0100)]
Use fd signal trick to break us out of select; do not sigwait

* The sigwait approach to detecting aio does not work because some
  versions of glibc forget to block signals on the private aio thread.
  This means that blocking SIGUSR2 is ineffective; the signals can be
  lost and the program can block in sigwait (!)

* Use of SIGUSR2 to interrupt select() does not work because signals
  which arrive just before entry to select() do not interrupt it.

So instead we use the time-honoured self-pipe trick: in the signal
handler we write to a pipe, which we select on when we want to wait
for the signal, and which we read from (to empty out) just before
actually doing the `top half' processing which deals with the condition
to which the signal relates.

16 years agoAdd missing #include "qemu-xen.h"
Ian Jackson [Wed, 30 Jul 2008 10:52:48 +0000 (11:52 +0100)]
Add missing #include "qemu-xen.h"

16 years agoRegister block drivers before reading xenstore.
Ian Jackson [Wed, 30 Jul 2008 10:52:03 +0000 (11:52 +0100)]
Register block drivers before reading xenstore.

Without this, cow images do not work.  Part of the fix to
 http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1304.

Thanks to report from Intel.

16 years agohw/serial: substitute gettimeofday with clock_gettime
Keir Fraser [Wed, 30 Jul 2008 10:07:43 +0000 (11:07 +0100)]
hw/serial: substitute gettimeofday with clock_gettime

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoremove type parameter from xc_physdev_map_pirq{,_msi}() xen-3.3.0-rc1
Ian Jackson [Thu, 24 Jul 2008 13:40:59 +0000 (14:40 +0100)]
remove type parameter from xc_physdev_map_pirq{,_msi}()

tools: remove type parameter from xc_physdev_map_pirq{,_msi}()
... as it's implied by the function name.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cross-ported from xen-unstable changeset
18128:0c320ae06d79d319f9fd419428e1539bc1b4818d

16 years agofix spurious track_dirty_vram warning
Ian Jackson [Thu, 24 Jul 2008 13:32:06 +0000 (14:32 +0100)]
fix spurious track_dirty_vram warning

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agopass-through.h: Sprinkle some #ifdefs to cope with pciutils-dev versions
Ian Jackson [Thu, 24 Jul 2008 12:57:10 +0000 (13:57 +0100)]
pass-through.h: Sprinkle some #ifdefs to cope with pciutils-dev versions

Some versions of pciutils-dev contain #defines which others are lacking.
To avoid spurious compiler warnings we add some #ifdefs.  *sigh*

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agoRevert "ACPI S3 state wake up - change to write flag behaviour"
Ian Jackson [Thu, 24 Jul 2008 12:47:46 +0000 (13:47 +0100)]
Revert "ACPI S3 state wake up - change to write flag behaviour"

This reverts commit 7fc722da73707a0965f8b43a67f2ef5fd9a9c143.

Following discussion on xen-devel and elsewhere, we have concluded
that the real problem here was that the S3 resume flag was in the ROM
memory region rather than the EBDA.  This has been fixed in
xen-unstable 18120.

We can therefore keep the whole of the ROM/BIOS area readonly.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoACPI S3 state wake up - change to write flag behaviour
Ian Jackson [Wed, 23 Jul 2008 18:01:00 +0000 (19:01 +0100)]
ACPI S3 state wake up - change to write flag behaviour

ioemu-remote: The device model needs to write in the ACPI tables when it
wakes up from S3 state.

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
16 years agoSave 3MB ioport table memory (Samuel Thibault)
aliguori [Wed, 23 Jul 2008 15:19:59 +0000 (15:19 +0000)]
Save 3MB ioport table memory (Samuel Thibault)

Save 1.5MB (32bit) or 3MB (64bit) memory by keeping ioport tables
sparse and use a test against NULL instead.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4927 c046a42c-6fe2-441c-8c8c-71466251a162
(cherry picked from commit 477e3edf8be5f0b998d19766198b6cf6b847557f)

16 years agoPrint a message announcing success when xen-setup finishes.
Ian Jackson [Wed, 23 Jul 2008 14:37:04 +0000 (15:37 +0100)]
Print a message announcing success when xen-setup finishes.

This will help mitigate confusion which might be caused by earlier
output from configure (eg the report of errors from the SDL test).

16 years agoWrite vnc port to xenstore.
Ian Jackson [Tue, 22 Jul 2008 16:04:35 +0000 (17:04 +0100)]
Write vnc port to xenstore.

(Reinstate accidentally dropped feature from xen-unstable.)

16 years agoCheck vnc_display_port, not vnc_display, for failure.
Ian Jackson [Tue, 22 Jul 2008 16:03:51 +0000 (17:03 +0100)]
Check vnc_display_port, not vnc_display, for failure.

This fixes a bug introduced in
  7e90700420eddad9298774fc4d12ed112f0d70f2
  Add vncunused option.
  [etc.]

16 years agoMerge latara:/usr/groups/xencore/HG/qemu-xen-unstable
Ian Jackson [Tue, 22 Jul 2008 15:35:11 +0000 (16:35 +0100)]
Merge latara:/usr/groups/xencore/HG/qemu-xen-unstable

16 years agoDo not unconditionally set CONFIG_SDL.
Ian Jackson [Tue, 22 Jul 2008 15:33:55 +0000 (16:33 +0100)]
Do not unconditionally set CONFIG_SDL.

CONFIG_SDL was erroneously hardwired in i386-dm/config.h and is no longer.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoDo not pass syntax errors to test if opengl is false.
Ian Jackson [Tue, 22 Jul 2008 15:28:57 +0000 (16:28 +0100)]
Do not pass syntax errors to test if opengl is false.

Put the quotes around $opengl in   test "$opengl" = "yes"

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoNicer fix for spurious messages from configure when GCC3 is missing.
Ian Jackson [Tue, 22 Jul 2008 15:28:06 +0000 (16:28 +0100)]
Nicer fix for spurious messages from configure when GCC3 is missing.

This reverts b5123e05cce4be4c6c8c822fad0f0df4c053da06 and replaces it
with a nice simple change, namely to change  test ... -a ...  with
test ... && test ... .  That provides shortcut evaluation.

Thanks to Andre Przywara who provided this one-line change as an
update to the previous commit.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoPass --disable-gfx-check to allow VNC-only builds.
Ian Jackson [Tue, 22 Jul 2008 15:23:47 +0000 (16:23 +0100)]
Pass --disable-gfx-check to allow VNC-only builds.

Qemu upstream inexplicably falls over during configuration if you will
be forced to use VNC for graphics, as if that were somehow an
unreasonable thing to do.  So hit that check on the head.

Thanks to Christoph Egger for the report.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoioemu: fix vram tracking when !s->lfb_addr
Keir Fraser [Tue, 22 Jul 2008 14:58:20 +0000 (15:58 +0100)]
ioemu: fix vram tracking when !s->lfb_addr

When we don't have an LFB (standard VGA), we can not and do not need
vram tracking at all since we always get explicit dirtying.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agoFix HVM direct kernel booting.
Ian Jackson [Tue, 22 Jul 2008 14:49:52 +0000 (15:49 +0100)]
Fix HVM direct kernel booting.

This was broken during the merge with qemu upstream.

Fixes:
 * Properly update kernel loading address so that qemu actually
   loads the kernel where we want it.
 * Use 0x200000 not 0x20000 as the updated kernel loading address.
 * Use stl_phys(real_addr+0x214,) rather than stl_p(header+0x214,),
   as the header has already been copied into target memory so we
   need to update it there.

16 years agoAdd missing cast for printf of maddr
Ian Jackson [Tue, 22 Jul 2008 10:55:18 +0000 (11:55 +0100)]
Add missing cast for printf of maddr

16 years agopci passthrough changes ported across from xen-unstable by Yuji Shimada
Ian Jackson [Tue, 22 Jul 2008 10:52:24 +0000 (11:52 +0100)]
pci passthrough changes ported across from xen-unstable by Yuji Shimada

The patch contains following patches which have been applied to Xen
Unstable Changeset 17959-18076.

pci_config_passthrough_with_msi_msix.patch

    [Xen-devel] [PATCH] Support more Capability Structures (including
    MSI/MSI-X) and Device Specific Registers for pt device.
    Yuji Shimada <shimada-yxb@necst.nec.co.jp>
    Fri, 04 Jul 2008 15:26:52 +0900

fix_pt_iomap.patch

    Re: [Xen-devel] [PATCH] Support more Capability Structures
    (including MSI/MSI-X) and Device Specific Registers for pt device.
    NISHIGUCHI Naoki <nisiguti@jp.fujitsu.com>
    Tue, 08 Jul 2008 14:14:55 +0900

fix_pt_bar_mapping.patch

    [Xen-devel] [PATCH] ioemu: pass-through: pt_bar_mapping fix
    NISHIGUCHI Naoki <nisiguti@jp.fujitsu.com>
    Wed, 09 Jul 2008 15:46:15 +0900

fix_hot-remove.patch

    [Xen-devel] [PATCH] Fix issues when passthrough device is
    hot-removed from HVM domain
    Yuji Shimada <shimada-yxb@necst.nec.co.jp>
    Wed, 16 Jul 2008 09:20:11 +0900

chk_bar_overlap_bugfix.patch

    [Xen-devel] [PATCH] ioemu: alternative patch fixing pt_chk_bar_overlap
    Yuji Shimada <shimada-yxb@necst.nec.co.jp>
    Thu, 17 Jul 2008 16:05:11 +0900

Thanks

Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp>
16 years agohw/pass-through.c: pt_unregister_regions returns void
Ian Jackson [Fri, 18 Jul 2008 15:02:23 +0000 (16:02 +0100)]
hw/pass-through.c: pt_unregister_regions returns void

It only ever falls off the end, and its return value is not used
by its one caller.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoAdd missing #include "qemu-xen.h" to hw/pass-through.c
Ian Jackson [Fri, 18 Jul 2008 15:00:02 +0000 (16:00 +0100)]
Add missing #include "qemu-xen.h" to hw/pass-through.c

16 years agoAdd missing #include "qemu-xen.h" to piix4acpi.c
Ian Jackson [Fri, 18 Jul 2008 14:58:54 +0000 (15:58 +0100)]
Add missing #include "qemu-xen.h" to piix4acpi.c

16 years agoMerge branch 'qemu'
Ian Jackson [Fri, 18 Jul 2008 14:56:27 +0000 (15:56 +0100)]
Merge branch 'qemu'

16 years agousb-linux.c: #define __user to work around broken Linux headers
Ian Jackson [Fri, 18 Jul 2008 14:51:19 +0000 (15:51 +0100)]
usb-linux.c: #define __user to work around broken Linux headers

Really we would like to #include <linux/compiler.h> but according
to changelogs in xen-unstable, at least FC6R3 doesn't have it.

This change is identical to xen-unstable
11601:ba7487569374378b398a1b134ea108a6a8209b4b.

16 years agoioemu-remote: use xenstore direct_pci
Ian Jackson [Fri, 18 Jul 2008 14:37:42 +0000 (15:37 +0100)]
ioemu-remote: use xenstore direct_pci

ioemu-remote: Use xenstore's direct_pci instead of the one from the
command line if there is some pass-through devices.

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
16 years agoioemu-remote: pt_init must take a const direct_pci.
Ian Jackson [Fri, 18 Jul 2008 14:34:32 +0000 (15:34 +0100)]
ioemu-remote: pt_init must take a const direct_pci.

[ Also copes with direct_pci==0 on entry, which was the
  remaining portion of b7eec990223bb8c4b145597af37592103c412542 -iwj ]

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
16 years agoRevert "ioemu-remote: Fix the pass-through compilation."
Ian Jackson [Fri, 18 Jul 2008 14:32:36 +0000 (15:32 +0100)]
Revert "ioemu-remote: Fix the pass-through compilation."

This reverts commit b7eec990223bb8c4b145597af37592103c412542.

Jean Guyader has provided a more comprehensive fix for the direct_pci
change later and the PT_LOG change to use stdout

16 years agoioemu-remote: Fix the pass-through compilation.
Ian Jackson [Fri, 18 Jul 2008 14:28:23 +0000 (15:28 +0100)]
ioemu-remote: Fix the pass-through compilation.

(For 32bit.)

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
16 years agoDo not disturb old fd flags (eg O_APPEND) when setting nonblock.
Ian Jackson [Fri, 18 Jul 2008 13:28:52 +0000 (14:28 +0100)]
Do not disturb old fd flags (eg O_APPEND) when setting nonblock.

socket_set_nonblock should not unconditionally call
fcntl(,F_SETFL,O_NONBLOCK) because that would clear other flags which
might be intentionally set on the fd.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoAlways use nonblocking mode for qemu_chr_open_fd.
Ian Jackson [Fri, 18 Jul 2008 13:24:17 +0000 (14:24 +0100)]
Always use nonblocking mode for qemu_chr_open_fd.

The rest of qemu assumes that IO operations on a CharDriverState do
not block.  Currently there are a couple of cases where such a driver
was set up but the calls to set nonblocking mode were missing:
 * qemu_chr_open_pty
 * qemu_chr_open_pipe
 * qemu_chr_open_stdio

This is fixed by adding two calls to socket_set_nonblock to
qemu_chr_open_fd.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoDo not call fcntl(, O_NONBLOCK) pointlessly.
Ian Jackson [Fri, 18 Jul 2008 13:15:01 +0000 (14:15 +0100)]
Do not call fcntl(, O_NONBLOCK) pointlessly.

It is silly to call fcntl(fd,F_SETFL,O_NONBLOCK) immediately after
opening the fd in nonblocking mode.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoide: enable single word DMA
Ian Jackson [Fri, 18 Jul 2008 13:33:07 +0000 (14:33 +0100)]
ide: enable single word DMA

Windows XP doesn't enable DMA by default on dvd-rom devices emulated by QEMU.
Furthermore if I try to manually enable DMA using Device Manager, the
DMA mode chosen by Windows is inexplicably one of the few modes
unsupported by QEMU: single word mode 2.
Since on virtual hardware single word DMA is not really slower than
multi word DMA, it makes sense for QEMU to support single word dma as
well.

This patch does exactly this.  We also make sure that mdma is
deactivated when sdma is active and vice versa.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoReintegrate media insert functionality
Ian Jackson [Wed, 16 Jul 2008 13:01:41 +0000 (14:01 +0100)]
Reintegrate media insert functionality

With patch applied I am able to switch ISO images by writing new
image name to /local/domain/0/backend/vbd/<domid>/<diskid>/params

Signed-off-by: Pat Campbell <plc@novell.com>
16 years agoEnable PCI passthrough by default.
Ian Jackson [Tue, 15 Jul 2008 17:55:44 +0000 (18:55 +0100)]
Enable PCI passthrough by default.

Patch from Jean Guyader / Samuel Thibault.

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoInclude <exec-all.h>
Ian Jackson [Tue, 15 Jul 2008 17:50:59 +0000 (18:50 +0100)]
Include <exec-all.h>

16 years agoMerge branch 'master' of ../qemu-iwj
Ian Jackson [Tue, 15 Jul 2008 17:47:44 +0000 (18:47 +0100)]
Merge branch 'master' of ../qemu-iwj

16 years agoMerge branch 'qemu'
Ian Jackson [Tue, 15 Jul 2008 17:46:25 +0000 (18:46 +0100)]
Merge branch 'qemu'

16 years agoCorrected fixes for passthrough compilation.
Ian Jackson [Tue, 15 Jul 2008 17:45:12 +0000 (18:45 +0100)]
Corrected fixes for passthrough compilation.

16 years agoSaner calculation of stubdom IDE_DMA_BUF_SECTORS.
Ian Jackson [Tue, 15 Jul 2008 17:40:04 +0000 (18:40 +0100)]
Saner calculation of stubdom IDE_DMA_BUF_SECTORS.

Thanks to Samuel Thibault.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoHonour -DNO_AIO.
Ian Jackson [Tue, 15 Jul 2008 17:36:40 +0000 (18:36 +0100)]
Honour -DNO_AIO.

Based on a patch by Samuel Thibault.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoNew --disable-audio configure option.
Ian Jackson [Tue, 15 Jul 2008 17:19:28 +0000 (18:19 +0100)]
New --disable-audio configure option.

This disables all audio support including drivers and -DHAS_AUDIO.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoDo not set -DHAS_AUDIO without CONFIG_AUDIO
Ian Jackson [Tue, 15 Jul 2008 17:18:42 +0000 (18:18 +0100)]
Do not set -DHAS_AUDIO without CONFIG_AUDIO

16 years agoDo not build dyngen
Ian Jackson [Tue, 15 Jul 2008 17:03:32 +0000 (18:03 +0100)]
Do not build dyngen

16 years agoioemu-remote: Fix the pass-through compilation.
Ian Jackson [Tue, 15 Jul 2008 16:45:26 +0000 (17:45 +0100)]
ioemu-remote: Fix the pass-through compilation.

Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>
16 years agoMerge branch 'qemu'
Ian Jackson [Tue, 15 Jul 2008 16:36:58 +0000 (17:36 +0100)]
Merge branch 'qemu'

16 years agoDo not try to use -net user as a default when slirp disabled.
Ian Jackson [Tue, 15 Jul 2008 16:35:57 +0000 (17:35 +0100)]
Do not try to use -net user as a default when slirp disabled.

Patch from Jeremy Fitzhardinge <jeremy@goop.org> (who is a Citrix
staff member).

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoDisable gcc version check.
Ian Jackson [Tue, 15 Jul 2008 16:32:55 +0000 (17:32 +0100)]
Disable gcc version check.

This is not relevant for qemu-dm as we do not use the
qemu cpu emulations.

16 years agoMerge branch 'qemu'
Ian Jackson [Tue, 15 Jul 2008 16:15:22 +0000 (17:15 +0100)]
Merge branch 'qemu'

16 years agoWith --disable-gcc-check, do not produce spurious errors if no GCC3 at all.
Ian Jackson [Tue, 15 Jul 2008 16:15:12 +0000 (17:15 +0100)]
With --disable-gcc-check, do not produce spurious errors if no GCC3 at all.

Small patch thanks to Prashanth.Mundkur@citrix.com.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoqemu ioemu rendering fixes for palette handling (another dropped patch)
Ian Jackson [Mon, 14 Jul 2008 12:46:28 +0000 (13:46 +0100)]
qemu ioemu rendering fixes for palette handling (another dropped patch)

Stefano reports that this part of xen-unstable 17334:baff5b3aaf13
was accidentally dropped.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoRevert "ioemu: drop unused 4MB video memory"
Ian Jackson [Mon, 14 Jul 2008 12:13:26 +0000 (13:13 +0100)]
Revert "ioemu: drop unused 4MB video memory"

This reverts commit 2b7a55d6133cae388c0b506ba6f0110bbf9a9318.

This has various compatibility problems, including breaking
restoration of old images.  It is also likely that we will want to
increase this amount in the future.

16 years agoioemu: sdl without OpenGl fix
Keir Fraser [Mon, 14 Jul 2008 09:08:13 +0000 (10:08 +0100)]
ioemu: sdl without OpenGl fix
Signed-off-by: Frederic Guihery <sygus@cat-lan.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
16 years agoioemu: drop shadow vram
Keir Fraser [Fri, 11 Jul 2008 11:40:52 +0000 (12:40 +0100)]
ioemu: drop shadow vram

We can now actually drop the shadow vram entirely thanks to dirty page
tracking.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agoioemu: drop unused 4MB video memory
Keir Fraser [Thu, 10 Jul 2008 16:32:17 +0000 (17:32 +0100)]
ioemu: drop unused 4MB video memory

Since we only emulate the cirrus VGA video card which is only able to
expose 4MB video memory, we don't need more than that.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agoioemu: create a rom-protect platform flag.
Keir Fraser [Thu, 10 Jul 2008 15:53:12 +0000 (16:53 +0100)]
ioemu: create a rom-protect platform flag.

Signed-off-by: Trolle Selander <trolle.selander@eu.citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
16 years agoDisable slirp.
Ian Jackson [Thu, 10 Jul 2008 09:48:51 +0000 (10:48 +0100)]
Disable slirp.

The slirp system is not really a very nice idea, especially not in a
Xen context.  Also, the code misuses inline and does not compile on
GCC >4.3ish.

Thanks to Qing He <qing.he@intel.com> for the report.