Skip to contentSkip to conversation

Trivial patches for 22 February to 8 March 2013

GIT PULL New Stefan Hajnoczi 1 participant 9 messages Mar 8, 2013

lore
Share & tools
lore
#0 lore raw

I misplaced some patches by accident, this is the fixed pull request.

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 db2d5eba652ecb7420ac4ef79fc747ef391ad0d9:

Fix the wrong description in qemu manual (2013-03-08 13:15:27 +0100)

----------------------------------------------------------------
Cole Robinson (1):
rtc-test: Fix test failures with recent glib

Jan Kiszka (1):
configure: Create link to icon bitmap for out-of-tree builds

Lei Li (2):
osdep: replace setsockopt by qemu_setsockopt Fix the wrong description in qemu manual

Michal Privoznik (1):
configure: Require at least spice-protocol-0.12.3

Paolo Bonzini (1):
lm32: remove unused function

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             |  3 ++-
 hw/milkymist-hw.h     | 16 ----------------
 hw/pci/pci_host.h     |  1 -
 hw/piix_pci.c         |  1 -
 hw/ppc/prep.c         |  1 -
 qemu-options.hx       |  2 +-
 tests/rtc-test.c      |  4 ++--
 util/osdep.c          |  4 ++--
 9 files changed, 9 insertions(+), 27 deletions(-)
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/8 configure: Create link to icon bitmap for out-of-tree builds

From: Jan Kiszka <[email protected]>

This allows to pick up the icon when starting QEMU directly from an out-of-tree build directory.

---
 configure | 1 +
 1 file changed, 1 insertion(+)
configure +1 -0
index 2f98c5a..87b2e73 100755
@@ -4369,6 +4369,7 @@ FILES="$FILES tests/tcg/lm32/Makefile po/Makefile"
 FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
 FILES="$FILES pc-bios/spapr-rtas/Makefile"
 FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
+FILES="$FILES pc-bios/qemu-icon.bmp"
 for bios_file in \
     $source_path/pc-bios/*.bin \
     $source_path/pc-bios/*.aml \
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 2/8 rtc-test: Fix test failures with recent glib

In reply to Stefan Hajnoczi

From: Cole Robinson <[email protected]>

As of glib 2.35.4, glib changed its logic for ordering test cases:

https://bugzilla.gnome.org/show_bug.cgi?id=694487

This was causing failures in rtc-test. Group the reordered test cases into their own suite, which maintains the original ordering.

---
 tests/rtc-test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/rtc-test.c +2 -2
index c5fd042..9ab583b 100644
@@ -565,8 +565,8 @@ int main(int argc, char **argv)
     qtest_add_func("/rtc/basic/bcd-12h", basic_12h_bcd);
     qtest_add_func("/rtc/set-year/20xx", set_year_20xx);
     qtest_add_func("/rtc/set-year/1980", set_year_1980);
-    qtest_add_func("/rtc/register_b_set_flag", register_b_set_flag);
-    qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
+    qtest_add_func("/rtc/misc/register_b_set_flag", register_b_set_flag);
+    qtest_add_func("/rtc/misc/fuzz-registers", fuzz_registers);
     ret = g_test_run();
 
     if (s) {
Signature · 1 line
1.8.1.4
#3 lore raw

PATCH 3/8 lm32: remove unused function

In reply to Stefan Hajnoczi

From: Paolo Bonzini <[email protected]>

The milkymist-minimac device in fact does not exist at all.

---
 hw/milkymist-hw.h | 16 ----------------
 1 file changed, 16 deletions(-)
hw/milkymist-hw.h +0 -16
index c8bd7e9..5def311 100644
@@ -170,22 +170,6 @@ static inline DeviceState *milkymist_ac97_create(hwaddr base,
     return dev;
 }
 
-static inline DeviceState *milkymist_minimac_create(hwaddr base,
-        qemu_irq rx_irq, qemu_irq tx_irq)
-{
-    DeviceState *dev;
-
-    qemu_check_nic_model(&nd_table[0], "minimac");
-    dev = qdev_create(NULL, "milkymist-minimac");
-    qdev_set_nic_properties(dev, &nd_table[0]);
-    qdev_init_nofail(dev);
-    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
-    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq);
-    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq);
-
-    return dev;
-}
-
 static inline DeviceState *milkymist_minimac2_create(hwaddr base,
         hwaddr buffers_base, qemu_irq rx_irq, qemu_irq tx_irq)
 {
Signature · 1 line
1.8.1.4
#4 lore raw

PATCH 4/8 osdep: replace setsockopt by qemu_setsockopt

In reply to Stefan Hajnoczi

From: Lei Li <[email protected]>

Fix the compiler warning when cross build qemu-ga
for windows by using qemu_setsockopt() instead of
setsockopt().

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
index c408261..bd59ac9 100644
@@ -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
#5 lore raw

PATCH 5/8 configure: Require at least spice-protocol-0.12.3

In reply to Stefan Hajnoczi

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
index 87b2e73..f2c46b2 100755
@@ -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
#6 lore raw

PATCH 6/8 rng-random: Use qemu_open / qemu_close

In reply to Stefan Hajnoczi

From: 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
index 0d11088..acd20af 100644
@@ -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
#7 lore raw

PATCH 7/8 pci_host: Drop write-only address_space field

In reply to Stefan Hajnoczi

From: 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
index 1845d4d..236cd0f 100644
@@ -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
index 6c77e49..9246983 100644
@@ -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
index e06dded..2920911 100644
@@ -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
#8 lore raw

PATCH 8/8 Fix the wrong description in qemu manual

In reply to Stefan Hajnoczi

From: 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
index 6f9334a..cd76f2a 100644
@@ -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