]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/log
qemu-xen-3.3-testing.git
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 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.

16 years agoBuild tpm_tis.c
Ian Jackson [Wed, 9 Jul 2008 14:36:26 +0000 (15:36 +0100)]
Build tpm_tis.c

16 years agoSet HVM_PARAM_DM_DOMAIN (in CONFIG_STUBDOM case)
Ian Jackson [Wed, 9 Jul 2008 14:25:41 +0000 (15:25 +0100)]
Set HVM_PARAM_DM_DOMAIN (in CONFIG_STUBDOM case)

Via: Samuel Thibault <samuel.thibault@eu.citrix.com>
From xen-unstable c/s 17444.

Adjusted to be #ifdef CONFIG_STUBDOM by me.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoOpenGL detection compilation fixes
Ian Jackson [Wed, 9 Jul 2008 14:18:38 +0000 (15:18 +0100)]
OpenGL detection compilation fixes

From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoPassthrough compilation fixes
Ian Jackson [Wed, 9 Jul 2008 14:13:18 +0000 (15:13 +0100)]
Passthrough compilation fixes

from Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoDo not attempt to move config-host.h aside if it does not exist
Ian Jackson [Wed, 9 Jul 2008 12:06:24 +0000 (13:06 +0100)]
Do not attempt to move config-host.h aside if it does not exist

16 years agoStore pty name in xenstore for the benefit of the tools.
Ian Jackson [Wed, 9 Jul 2008 11:32:09 +0000 (12:32 +0100)]
Store pty name in xenstore for the benefit of the tools.

This is a rather intrusive patch, because we need a mechanism to get
the ptsname out of the guts of the qemu startup code.  This is a
first cut of such a thing which might eventually go upstream.

The main new interface is chr_getname, a new CharDriverState method.
If implemented it returns "<type> <name>" where currently "<type>" is
"pty" for ptys.  If not implemented the function pointer may be null.

We import store_dev_info from xen-unstable (17987:9b35ae586cb8) and
eviscerate it appropriately.

16 years agoDo not rebuild every time ./xen-setup is run.
Ian Jackson [Wed, 9 Jul 2008 10:38:33 +0000 (11:38 +0100)]
Do not rebuild every time ./xen-setup is run.

This involves saving config-host.h while we rerun config and
regenerate it, putting the saved version back, and then installing
the new version only if it has changed.

16 years agoioemu: do not create the built-in cdrom device
Ian Jackson [Tue, 8 Jul 2008 19:32:08 +0000 (20:32 +0100)]
ioemu: do not create the built-in cdrom device

This conflicts with xenstore.c's arrangements.
This current patch is a bit of a kludge but the upstream arrangements
make it hard to do better.

16 years agoBuild system fixes for integration with xen-unstable
Ian Jackson [Tue, 8 Jul 2008 16:04:06 +0000 (17:04 +0100)]
Build system fixes for integration with xen-unstable

* qemu-dm goes in /usr/$(LIBLEAFDIR)/xen/bin
* install qemu-ifup (copied from xen-unstable tip 17987:9b35ae586cb8)
  in /etc/xen

16 years agoActually allocate phys_ram_dirty (!)
Ian Jackson [Tue, 8 Jul 2008 10:36:50 +0000 (11:36 +0100)]
Actually allocate phys_ram_dirty (!)

Previously the plumbing for phys_ram_size was broken.

16 years agoBuild system fixes for qemu
Ian Jackson [Tue, 8 Jul 2008 10:10:06 +0000 (11:10 +0100)]
Build system fixes for qemu

Use -include rather than include in several places, which makes make
clean from xen-unstable's build system work better.

Set prefix to /usr in xen-setup, as xen-unstable always targets /usr (!)

16 years agofix disk format security vulnerability; do not guess format for qcow vbds
Ian Jackson [Tue, 8 Jul 2008 09:29:37 +0000 (10:29 +0100)]
fix disk format security vulnerability; do not guess format for qcow vbds

These are the accidentally dropped hunks of xen-unstable 17606 and 17646.

Particularly, 17606 is important:

  * make the xenstore reader in qemu-dm's startup determine which
    of qemu's block drivers to use according to the xenstore
    backend `type' field.  This `type' field typically comes from
    the front of the drive mapping string in ioemu.  The
    supported cases are:
      xm config file string      `type'  image format    qemu driver
       phy:[/dev/]<device>        phy     raw image       bdrv_raw
       file:<filename>            file    raw image       bdrv_raw
       tap:aio:<filename>         tap     raw image       bdrv_raw
       tap:qcow:<image>           tap     not raw         autoprobe
       tap:<cow-fmt>:<image>      tap     named format    bdrv_<cow-fmt>
    It is still necessary to autoprobe when the image is specified as
    `tap:qcow:<image>', because qemu distinguishes `qcow' and `qcow2'
    whereas blktap doesn't; `qcow' in xenstore typically means what
    qemu calls qcow2.  This is OK because qemu can safely distinguish
    the different cow formats provided we know it's not a raw image.

16 years agoioemu: SDL rendering using OpenGL (lost fragment)
Ian Jackson [Mon, 7 Jul 2008 14:49:50 +0000 (15:49 +0100)]
ioemu: SDL rendering using OpenGL (lost fragment)

Lost fragment of xen-unstable c/s 17225.  Thanks to Samuel Thibault
for checking.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoFix remaining missing changes to update to xen-unstable 17958.
Ian Jackson [Mon, 7 Jul 2008 14:30:10 +0000 (15:30 +0100)]
Fix remaining missing changes to update to xen-unstable 17958.

We had accidentally dropped some changes from 17737 to 17831.
Fixed by in xen-unstable:
  hg update 17737
  patch -p1 < vga-patch-from-xen-unstable-17737:c93a913c221f
  hg diff -r 17831 tools/ioemu >patch
and then in qemu.git:
  patch -R -U -p3 <.../patch
and fix up conflicts, which were:
  Makefile.target - stubdom changes, defer for now
  hw/vga.c - one easy fixup, one change already in our tree
  hw/xenfb.c - already done completely earlier, so discard changes

16 years agoMerge ../qemu-2iwj
Ian Jackson [Fri, 4 Jul 2008 15:48:24 +0000 (16:48 +0100)]
Merge ../qemu-2iwj

16 years agoCompilation fixes following merge.
Ian Jackson [Fri, 4 Jul 2008 15:48:18 +0000 (16:48 +0100)]
Compilation fixes following merge.

16 years agoMerge with xen-unstable tip 17958
Ian Jackson [Fri, 4 Jul 2008 15:35:26 +0000 (16:35 +0100)]
Merge with xen-unstable tip 17958

This was achieved with
  hg diff -r{17831,17958} tools/ioemu
and feeding the result to patch and fixing up conflicts.

As an exception, xenfb.c was done the other way around:
 * hg update 17737, apply vga-patch-from-xen-unstable-17737\:c93a913c221f
 * diff that against git 79a235b20a6833fe5bdc78b52921cdd2ad12f284
   (current qemu-xen tip)
 * cp hg 17958's xenfb.c into git, apply patch from above, fixing up
   changes; one change dropped (removal of call to fbfront_resize
   in xenfb_pv_resize_shared)

16 years agoDo not pass -Wno-pointer-sign if not supported
Ian Jackson [Fri, 4 Jul 2008 14:36:11 +0000 (15:36 +0100)]
Do not pass -Wno-pointer-sign if not supported

16 years agoMerge branch 'qemu'
Ian Jackson [Wed, 2 Jul 2008 17:38:35 +0000 (18:38 +0100)]
Merge branch 'qemu'

16 years agoMerge branch 'iwj.block-rw-rangecheck' into qemu
Ian Jackson [Wed, 2 Jul 2008 17:38:26 +0000 (18:38 +0100)]
Merge branch 'iwj.block-rw-rangecheck' into qemu

16 years agoqemu-xen: Fix extendable images iwj.block-rw-rangecheck
Ian Jackson [Wed, 2 Jul 2008 17:38:07 +0000 (18:38 +0100)]
qemu-xen: Fix extendable images

bdrv_file_open should specify raw image format instead of
guessing. This fixes a segfault when bdrv_open2 wants to access
drv->flags. bdrv_file_open is used at least by qcow2.

Additionally, move the extensible flag from bdrv_host_device to
bdrv_raw. qcow2 wants to open the image file as an extensible file.

Signed-off-by: Kevin Wolf <kwolf@suse.de>
16 years agoqemu-xen: Fix PV segfault
Ian Jackson [Wed, 2 Jul 2008 17:24:35 +0000 (18:24 +0100)]
qemu-xen: Fix PV segfault

Create a dummy CPU during PV machine initialization. This avoids NULL
pointer accesses.

Signed-off-by: Kevin Wolf <kwolf@suse.de>
16 years agoExpect absolute XEN_ROOT - this is more sane
Ian Jackson [Wed, 2 Jul 2008 15:22:02 +0000 (16:22 +0100)]
Expect absolute XEN_ROOT - this is more sane

16 years agoPropagate XEN_ROOT_PARENT when supplied by parent build system
Ian Jackson [Wed, 2 Jul 2008 15:12:27 +0000 (16:12 +0100)]
Propagate XEN_ROOT_PARENT when supplied by parent build system

16 years agoblktap: Automatically start tapdisk-ioemu on demand
Ian Jackson [Tue, 1 Jul 2008 17:45:10 +0000 (18:45 +0100)]
blktap: Automatically start tapdisk-ioemu on demand

When a domain wants to use a tap:ioemu disk but has no device model,
start a tapdisk-ioemu instance as provider. Also, move the creation
and removal of communication pipes to xend so that qemu-dm doesn't
need the unwanted SIGHUP handler anymore.

Signed-off-by: Kevin Wolf <kwolf@suse.de>
(xen-unstable c/s 17512:2bc699de2297aefb4eb07f1f6b8586e5fe92c6bb
 accidentally lost during merge, reinstating now)

16 years agoRemove accidentally duplicated check for divider==0
Ian Jackson [Tue, 1 Jul 2008 17:29:57 +0000 (18:29 +0100)]
Remove accidentally duplicated check for divider==0

Thanks to Trolle Selander.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoActually call qemu_set_fd_handler(xenstore_fd(), ...
Ian Jackson [Thu, 19 Jun 2008 15:09:14 +0000 (16:09 +0100)]
Actually call qemu_set_fd_handler(xenstore_fd(), ...

16 years agoNew hook "main_loop_prepare" for us to set cur_cpu. Urgh
Ian Jackson [Thu, 19 Jun 2008 09:21:59 +0000 (10:21 +0100)]
New hook "main_loop_prepare" for us to set cur_cpu.  Urgh

16 years agoSet VNC password from xenstore.
Ian Jackson [Thu, 19 Jun 2008 09:21:17 +0000 (10:21 +0100)]
Set VNC password from xenstore.

Upstream doesn't appear to have a way to set the password other than
from the monitor, so we introduce this which is a bit messy.

When upstream's new option/config parsing is merged, we should make a
patch for upstream with a config option to read the password out of a
file or fd, and use that.

16 years agoInitialise xc_handle; get rid of some xen-useless stuff in initialisation
Ian Jackson [Wed, 18 Jun 2008 13:10:19 +0000 (14:10 +0100)]
Initialise xc_handle; get rid of some xen-useless stuff in initialisation

16 years agoChange install paths to /usr/share/xen for Xen build
Ian Jackson [Tue, 17 Jun 2008 15:34:22 +0000 (16:34 +0100)]
Change install paths to /usr/share/xen for Xen build

16 years agoAllow bridge=... as synonym for scriptarg=...
Ian Jackson [Thu, 12 Jun 2008 17:41:11 +0000 (18:41 +0100)]
Allow bridge=... as synonym for scriptarg=...

16 years agoMerge branch 'master' into xen
Ian Jackson [Thu, 12 Jun 2008 17:28:24 +0000 (18:28 +0100)]
Merge branch 'master' into xen