Trivial patches for 22 February to 8 March 2013
The following changes since commit 0bc472a9d6b80567c212023c5eae413f4dfb53ad:
hw/nand.c: correct the sense of the BUSY/READY status bit (2013-03-07 09:27:11 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git trivial-patches
for you to fetch changes up to 5ccbb63abba9034b265a34282ccf4ae2164df501:
osdep: replace setsockopt by qemu_setsockopt (2013-03-08 10:46:00 +0100)
----------------------------------------------------------------
Lei Li (2):
Fix the wrong description in qemu manual
osdep: replace setsockopt by qemu_setsockopt
Michal Privoznik (1):
configure: Require at least spice-protocol-0.12.3
Peter Maydell (1):
pci_host: Drop write-only address_space field
Stefan Berger (1):
rng-random: Use qemu_open / qemu_close
backends/rng-random.c | 4 ++-- configure | 2 +- hw/pci/pci_host.h | 1 - hw/piix_pci.c | 1 - hw/ppc/prep.c | 1 - qemu-options.hx | 2 +- util/osdep.c | 4 ++-- 7 files changed, 6 insertions(+), 9 deletions(-)
Signature · 1 line
1.8.1.4
PATCH 1/5 configure: Require at least spice-protocol-0.12.3
From: Michal Privoznik <[email protected]>
As of 5a49d3e9 we assume SPICE_PORT_EVENT_BREAK to be defined. However, it is defined not in 0.12.2 what we require now, but in 0.12.3. Therefore in order to prevent build failure we must adjust our minimal requirements.
--- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
@@ -2871,7 +2871,7 @@ EOF spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null) spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null) if $pkg_config --atleast-version=0.12.0 spice-server >/dev/null 2>&1 && \ - $pkg_config --atleast-version=0.12.2 spice-protocol > /dev/null 2>&1 && \ + $pkg_config --atleast-version=0.12.3 spice-protocol > /dev/null 2>&1 && \ compile_prog "$spice_cflags" "$spice_libs" ; then spice="yes" libs_softmmu="$libs_softmmu $spice_libs"
Signature · 1 line
1.8.1.4
PATCH 2/5 rng-random: Use qemu_open / qemu_close
In reply to Stefan HajnocziFrom: Stefan Berger <[email protected]>
In the rng backend use qemu_open and qemu_close rather than POSIX open/close.
--- backends/rng-random.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
backends/rng-random.c +2 -2
@@ -74,7 +74,7 @@ static void rng_random_opened(RngBackend *b, Error **errp)error_set (errp,QERR_INVALID_PARAMETER_VALUE ,"filename" ,"a valid filename" ); }else { - s->fd =open (s->filename,O_RDONLY |O_NONBLOCK ); + s->fd =qemu_open (s->filename,O_RDONLY |O_NONBLOCK );if (s->fd ==-1 ) {error_set (errp,QERR_OPEN_FILE_FAILED , s->filename);
@@ -130,7 +130,7 @@ static void rng_random_finalize(Object *obj)qemu_set_fd_handler (s->fd,NULL ,NULL ,NULL );if (s->fd !=-1 ) { -close (s->fd); +qemu_close (s->fd); }g_free (s->filename);
Signature · 1 line
1.8.1.4
PATCH 3/5 pci_host: Drop write-only address_space field
In reply to Stefan HajnocziFrom: Peter Maydell <[email protected]>
The address_space field of PCIHostState was only ever written, never used. Drop it completely.
--- hw/pci/pci_host.h | 1 - hw/piix_pci.c | 1 - hw/ppc/prep.c | 1 - 3 files changed, 3 deletions(-)
hw/pci/pci_host.h +0 -1
@@ -40,7 +40,6 @@ struct PCIHostState {MemoryRegion conf_mem;MemoryRegion data_mem;MemoryRegion mmcfg; -MemoryRegion *address_space;uint32_t config_reg;PCIBus *bus; };
hw/piix_pci.c +0 -1
@@ -244,7 +244,6 @@ static PCIBus *i440fx_common_init(const char *device_name, dev =qdev_create (NULL ,"i440FX-pcihost" ); s =PCI_HOST_BRIDGE (dev); - s->address_space = address_space_mem; b =pci_bus_new (dev,NULL , pci_address_space, address_space_io,0 ); s->bus = b;
hw/ppc/prep.c +0 -1
@@ -567,7 +567,6 @@ static void ppc_prep_init(QEMUMachineInitArgs *args) dev =qdev_create (NULL ,"raven-pcihost" ); pcihost =PCI_HOST_BRIDGE (dev); - pcihost->address_space =get_system_memory ();object_property_add_child (qdev_get_machine (),"raven" ,OBJECT (dev),NULL );qdev_init_nofail (dev); pci_bus = (PCIBus *)qdev_get_child_bus (dev,"pci.0" );
Signature · 1 line
1.8.1.4
PATCH 4/5 Fix the wrong description in qemu manual
In reply to Stefan HajnocziFrom: Lei Li <[email protected]>
Fix LP#1151450 the wrong description in qemu manual:
'qemu-system-x86_84' should be 'qemu-system-x86_64'.
--- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qemu-options.hx +1 -1
@@ -2132,7 +2132,7 @@ gluster[+transport]://[server[:port]]/volname/image[?socket=...] Example @example -qemu-system-x86_84 --drive file=gluster://192.0.2.1/testvol/a.img +qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img @end example See also @url{http://www.gluster.org}.
Signature · 1 line
1.8.1.4
PATCH 5/5 osdep: replace setsockopt by qemu_setsockopt
In reply to Stefan HajnocziFrom: Lei Li <[email protected]>
Fix the compiler warning when cross build qemu-ga
for windows by using qemu_setsockopt() instead ofsetsockopt().
util/osdep.c: In function 'socket_set_nodelay':util/osdep.c:69:5: warning: passing argument 4 of 'setsockopt' from
incompatible pointer type [enabled by default]
In file included from /home/lei/qemu_b/include/sysemu/os-win32.h:30:0,
from /home/lei/qemu_b/include/qemu-common.h:46,
from util/osdep.c:48:/usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:990:63: note:
expected 'const char *' but argument is of type 'int *'
--- util/osdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
util/osdep.c +2 -2
@@ -57,7 +57,7 @@ static const char *qemu_version = QEMU_VERSION;int socket_set_cork (int fd,int v) {#if defined(SOL_TCP ) && defined(TCP_CORK ) -return setsockopt (fd,SOL_TCP ,TCP_CORK , &v,sizeof (v)); +return qemu_setsockopt (fd,SOL_TCP ,TCP_CORK , &v,sizeof (v));#else return 0 ;#endif
@@ -66,7 +66,7 @@ int socket_set_cork(int fd, int v)int socket_set_nodelay (int fd) {int v =1 ; -return setsockopt (fd,IPPROTO_TCP ,TCP_NODELAY , &v,sizeof (v)); +return qemu_setsockopt (fd,IPPROTO_TCP ,TCP_NODELAY , &v,sizeof (v)); }int qemu_madvise (void *addr,size_t len,int advice)
Signature · 1 line
1.8.1.4
Quoted 11 lines · Stefan Hajnoczi
The following changes since commit
0bc472a9d6b80567c212023c5eae413f4dfb53ad:
hw/nand.c: correct the sense of the BUSY/READY status bit (2013-03-07 09:27:11 +0100)are available in the git repository at:
git://github.com/stefanha/qemu.gittrivial-patchesfor you to fetch changes up to
5ccbb63abba9034b265a34282ccf4ae2164df501:osdep: replace setsockopt by
qemu_setsockopt(2013-03-08 10:46:00 +0100)
Please ignore this pull request. I will resend with missing patches that I dropped by accident.
Stefan